From b0d13137cbd4c5fa33fa73e695ff156daac89a72 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 8 Aug 2019 13:06:24 -0400 Subject: [PATCH] Fix csit SUITES variable Change I43555ba960bf37f7cdd182be1574ae0249eb12d1 and I43555ba960bf37f7cdd182be1574ae0249eb12d1 introduced this regression trying to resolve shellcheck. Change-Id: Iee506845d7af4c5e49e96134ef9422b4e84d5020 Signed-off-by: Thanh Ha --- jjb/integration/integration-deploy-controller-run-test.sh | 3 ++- jjb/integration/integration-start-cluster-run-test.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index 2c9a2a17a..6195fa27d 100755 --- 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} ..." +# shellcheck disable=SC2086 robot -N "${TESTPLAN}" \ --removekeywords wuks -c critical -e exclude -e "skip_if_${DISTROSTREAM}" \ -v BUNDLEFOLDER:"${BUNDLEFOLDER}" \ @@ -86,7 +87,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 2f2b14c1d..0f1da123c 100644 --- 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} ..." +# shellcheck disable=SC2086 robot -N "${TESTPLAN}" \ --removekeywords wuks -c critical -e exclude -e "skip_if_${DISTROSTREAM}" \ -v BUNDLEFOLDER:"${BUNDLEFOLDER}" \ @@ -136,7 +137,7 @@ robot -N "${TESTPLAN}" \ -v TOOLS_SYSTEM_USER:"${USER}" \ -v USER_HOME:"${HOME}" \ -v WORKSPACE:/tmp \ - "${TESTOPTIONS}" "${SUITES}" || true + "${TESTOPTIONS}" ${SUITES} || true -- 2.36.6