From 423c8f73adb56260b3c1806e8dc64cf483d518c3 Mon Sep 17 00:00:00 2001 From: Mikkel Hagen Date: Mon, 21 May 2018 13:45:23 -0500 Subject: [PATCH 1/2] [skip ci]. --- tests/resources/nimbus-testbeds/vic-vsan.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/resources/nimbus-testbeds/vic-vsan.rb b/tests/resources/nimbus-testbeds/vic-vsan.rb index bf5726659e..f934be0384 100644 --- a/tests/resources/nimbus-testbeds/vic-vsan.rb +++ b/tests/resources/nimbus-testbeds/vic-vsan.rb @@ -141,7 +141,7 @@ testbed['vc']['dbHost'] = 'vc-mssql' end - testbed = VcQaTestbedCommon.addSharedDisks testbed, [20, 10, 20, 10], sharedStorageStyle # 2 x 20gb shared vmfs, 2 x 10gb free luns as defined by 'freeSharedLuns', DON'T CHANGE THE ORDERING UNLESS YOU KNOW WHAT YOU'RE DOING! + testbed = VcQaTestbedCommon.addSharedDisks testbed, [10, 10, 20, 20], sharedStorageStyle # 2 x 20gb shared vmfs, 2 x 10gb free luns as defined by 'freeSharedLuns', DON'T CHANGE THE ORDERING UNLESS YOU KNOW WHAT YOU'RE DOING! testbed end From 5c25105ab2f01fbc181366784550399e59fdb67f Mon Sep 17 00:00:00 2001 From: Mikkel Hagen Date: Mon, 21 May 2018 16:03:08 -0500 Subject: [PATCH 2/2] [skip ci]. --- tests/nightly/jenkins-nightly-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nightly/jenkins-nightly-run.sh b/tests/nightly/jenkins-nightly-run.sh index 8b8828976e..cc38897ec5 100755 --- a/tests/nightly/jenkins-nightly-run.sh +++ b/tests/nightly/jenkins-nightly-run.sh @@ -85,7 +85,7 @@ elif [[ $target == "6.5" ]]; then cat 65/pabot_results/*/stdout.txt | grep '::' | grep -E 'PASS|FAIL' > console.log elif [[ $target == "6.7" ]]; then echo "Executing nightly tests on vSphere 6.7" - pabot --processes 4 --removekeywords TAG:secret --exclude nsx --exclude hetero --exclude vsan-complex --variable ESX_VERSION:$ESX_67_VERSION --variable VC_VERSION:$VC_67_VERSION -d 67/$i tests/manual-test-cases/Group5-Functional-Tests tests/manual-test-cases/Group13-vMotion tests/manual-test-cases/Group21-Registries tests/manual-test-cases/Group23-Future-Tests + pabot --processes 4 --removekeywords TAG:secret --exclude nsx --exclude hetero --variable ESX_VERSION:$ESX_67_VERSION --variable VC_VERSION:$VC_67_VERSION -d 67/$i tests/manual-test-cases/Group5-Functional-Tests tests/manual-test-cases/Group13-vMotion tests/manual-test-cases/Group21-Registries tests/manual-test-cases/Group23-Future-Tests cat 67/pabot_results/*/stdout.txt | grep '::' | grep -E 'PASS|FAIL' > console.log fi # Pretty up the email results