Fix TESTOPTIONS should not be quoted

Change I43555ba960bf37f7cdd182be1574ae0249eb12d1 and
I43555ba960bf37f7cdd182be1574ae0249eb12d1 introduced this regression
trying to resolve shellcheck

Change-Id: Ife7313a2a01391bcb436c0e9906b8d5230c3ea90
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 6195fa27da2f282180106b188d42dd57ecea70ef..3a274190d8b8ac39543d90cfc750979696a385c6 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -49,6 +49,7 @@ done
 get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
+# ${TESTOPTIONS}, ${SUITES} are space-separated parameters and should not be quoted.
 # shellcheck disable=SC2086
 robot -N "${TESTPLAN}" \
       --removekeywords wuks -c critical -e exclude -e "skip_if_${DISTROSTREAM}" \
@@ -87,7 +88,7 @@ robot -N "${TESTPLAN}" \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
       -v WORKSPACE:/tmp \
-      "${TESTOPTIONS}" ${SUITES} || true
+      ${TESTOPTIONS} ${SUITES} || true
 
 echo "Examining the files in data/log and checking filesize"
 # shellcheck disable=SC2029

diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh
index 0f1da123c5a54575839d520ded26389dfdb2fb19..b253afc359279c4d535a4d944375da1d7ffac394 100644 (file)
--- a/jjb/integration/integration-start-cluster-run-test.sh
+++ b/jjb/integration/integration-start-cluster-run-test.sh
@@ -111,6 +111,7 @@ done
 get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
+# ${TESTOPTIONS}, ${SUITES} are space-separated parameters and should not be quoted.
 # shellcheck disable=SC2086
 robot -N "${TESTPLAN}" \
       --removekeywords wuks -c critical -e exclude -e "skip_if_${DISTROSTREAM}" \
@@ -137,7 +138,7 @@ robot -N "${TESTPLAN}" \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
       -v WORKSPACE:/tmp \
-      "${TESTOPTIONS}" ${SUITES} || true
+      ${TESTOPTIONS} ${SUITES} || true