Move controller CSIT to MRI group

[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 8c7192918a91ea6ec6daed613ebb9737d56c662d..67c264550cf5e5ef92db4d32934c3ab04cd928ad 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -105,7 +105,7 @@ function install_openstack_clients_in_robot_vm() {
 
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
         #networking-l2gw is not officially available in any release yet. Getting the latest stable version.
-        $PYTHON -m pip install networking-l2gw==11.0.0
+        $PYTHON -m pip install networking-l2gw==11.0.0 more-itertools==5.0.0
     fi
 }
 
@@ -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
@@ -1176,6 +1178,7 @@ for suite in ${SUITES}; do
     -v NUM_OS_SYSTEM:"${NUM_OPENSTACK_SYSTEM}" \
     -v NUM_TOOLS_SYSTEM:"${NUM_TOOLS_SYSTEM}" \
     -v ODL_SNAT_MODE:"${ODL_SNAT_MODE}" \
+    -v GROUP_ADD_MOD_ENABLED:"${GROUP_ADD_MOD_ENABLED}" \
     -v ODL_STREAM:"${DISTROSTREAM}" \
     -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" \
     -v ODL_SYSTEM_1_IP:"${ODL_SYSTEM_1_IP}" \
@@ -1208,7 +1211,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