Merge "Fix TESTOPTIONS and SUITES variables"

diff --combined jjb/integration/integration-deploy-openstack-run-test.sh
index 8c7192918a91ea6ec6daed613ebb9737d56c662d,6569665aa4812df2a6f8d30daa3db8afdf5a0c5c..0ca5106ce38907945139fd07a1da65f6ae27b58e
--- 1/jjb/integration/integration-deploy-openstack-run-test.sh
--- 2/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@@ -917,7 -917,7 +917,7 @@@ for i in $(seq 1 "${NUM_OPENSTACK_COMPU
      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 +1144,8 @@@ printf "Stacking elapsed time: %s\n" "$
  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 +1210,7 @@@
      -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