Fix SC2086 variables

Change-Id: I69d2903224e22fc9c5e465a14f9f6d3a9d45d992
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh
index b253afc359279c4d535a4d944375da1d7ffac394..16c1eb9710448d1d46d9da09a6643d12aa0a246f 100644 (file)
--- a/jjb/integration/integration-start-cluster-run-test.sh
+++ b/jjb/integration/integration-start-cluster-run-test.sh
@@ -132,9 +132,9 @@ robot -N "${TESTPLAN}" \
       -v NUM_ODL_SYSTEM:"${NUM_ODL_SYSTEM}" \
       -v NUM_TOOLS_SYSTEM:"${NUM_TOOLS_SYSTEM}" \
       -v ODL_STREAM:"${DISTROSTREAM}" \
-      -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" "${odl_variables}" \
+      -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" ${odl_variables} \
       -v ODL_SYSTEM_USER:"${USER}" \
-      -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" "${tools_variables}" \
+      -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
       -v WORKSPACE:/tmp \

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index cd82dbf4a8527b4bdbd938f35d82bc9f1b33ac86..a0399a09cff01fd20390d81b26f144497995922e 100755 (executable)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -212,6 +212,7 @@ for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
     fi
     pushd "${PROJECT_SHORTNAME}"
         # Build project
+        # shellcheck disable=SC2086
         "$MVN" clean install \
             -e ${fast_option} \
             -Dstream="$DISTROSTREAM" \
@@ -219,9 +220,9 @@ for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
             -Dmaven.gitcommitid.skip=false \
             --global-settings "$GLOBAL_SETTINGS_FILE" \
             --settings "$SETTINGS_FILE" \
-            "$MAVEN_OPTIONS"
-        # Since we've installed the artifacts, we can clean the build and save
-        # disk space
+            $MAVEN_OPTIONS
+        # Since we've installed the artifacts, we can clean the build and save disk space
+        # shellcheck disable=SC2086
         "$MVN" clean \
             -e ${fast_option} \
             -Dstream="$DISTROSTREAM" \
@@ -229,7 +230,7 @@ for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
             -Dmaven.gitcommitid.skip=false \
             --global-settings "$GLOBAL_SETTINGS_FILE" \
             --settings "$SETTINGS_FILE" \
-            "$MAVEN_OPTIONS"
+            $MAVEN_OPTIONS
     popd
 done