From a681d32bd2f2ae3de820e6363643b688f3ecfd87 Mon Sep 17 00:00:00 2001 From: George Hicken Date: Fri, 15 Jun 2018 20:22:23 -0700 Subject: [PATCH] Preserve quoting in test runner script --- tests/nightly/jenkins-nightly-run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/nightly/jenkins-nightly-run.sh b/tests/nightly/jenkins-nightly-run.sh index f0be5f58c0..766eeba082 100755 --- a/tests/nightly/jenkins-nightly-run.sh +++ b/tests/nightly/jenkins-nightly-run.sh @@ -24,7 +24,7 @@ VC_67_VERSION="ob-8217866" DEFAULT_LOG_UPLOAD_DEST="vic-ci-logs" DEFAULT_VCH_BUILD="*" -DEFAULT_TESTCASES="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" +DEFAULT_TESTCASES=("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") export RUN_AS_OPS_USER=0 @@ -38,8 +38,8 @@ fi target="$1" echo "Target version: ${target}" shift -# Take the remaining CLI arguments as a test case list -testcases="${*:-$DEFAULT_TESTCASES}" +# Take the remaining CLI arguments as a test case list - this is treated as an array to preserve quoting when passing to pabot +testcases=("${@:-${DEFAULT_TESTCASES[@]}}") # TODO: the version downloaded by this logic is not coupled with the tests that will be run against it. This should be altered to pull a version that matches the commit SHA of the tests # we will be running or similar mechanism. @@ -92,7 +92,7 @@ else fi -pabot --processes 4 --removekeywords TAG:secret ${excludes} --variable ESX_VERSION:${ESX_BUILD} --variable VC_VERSION:${VC_BUILD} -d ${target} "${testcases}" +pabot --processes 4 --removekeywords TAG:secret ${excludes} --variable ESX_VERSION:${ESX_BUILD} --variable VC_VERSION:${VC_BUILD} -d ${target} "${testcases[@]}" cat ${target}/pabot_results/*/stdout.txt | grep '::' | grep -E 'PASS|FAIL' > console.log # See if any VMs leaked