Merge "Fix TESTOPTIONS and SUITES variables"

[releng/builder.git] / jjb / integration / integration-deploy-openstack-run-test.sh

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index c550c7bc63ea59dad1bb43866beda9fa150086ba..0ca5106ce38907945139fd07a1da65f6ae27b58e 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -917,7 +917,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_COMPUTE_NODES}"); do
     fi
     fix_libvirt_python_build "${!COMPUTEIP}"
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
-    ssh "${!COMPUTEIP} ""cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
+    ssh "${!COMPUTEIP}" "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh "${!COMPUTEIP}" "ps -ef | grep stack.sh"
     os_node_list+=("${!COMPUTEIP}")
 done
@@ -1144,6 +1144,8 @@ printf "Stacking elapsed time: %s\n" "${stacktime}"
 echo "Starting Robot test suites ${SUITES} ..."
 # please add robot -v arguments on a single line and alphabetized
 suite_num=0
+# ${TESTOPTIONS}, ${SUITES} are space-separated parameters and should not be quoted.
+ # shellcheck disable=SC2086
 for suite in ${SUITES}; do
     # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
     # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them
@@ -1208,7 +1210,7 @@ for suite in ${SUITES}; do
     -v TOOLS_SYSTEM_3_IP:"${TOOLS_SYSTEM_3_IP}" \
     -v USER_HOME:"${HOME}" \
     -v WORKSPACE:/tmp \
-    "${TESTOPTIONS}" "${suite}" || true
+    ${TESTOPTIONS} ${suite} || true
 done
 #rebot exit codes seem to be different
 rebot --output "${WORKSPACE}/output.xml" --log log_full.html --report report.html -N openstack output_*.xml || true