Merge "Disable shellcheck for specific scripts"

diff --git a/.coafile b/.coafile
index 8d32fd0851d96ac72c4d30720210daff815f18d8..40e4c3ac1a4b5f5ef2bcc956b52efaa96fcfedf3 100644 (file)
--- a/.coafile
+++ b/.coafile
@@ -24,7 +24,23 @@ files = jenkins-scripts/**/*.sh,
     jjb/**/*.sh,
     scripts/**/*.sh
 ignore = jenkins-scripts/*-local-env.sh,
-    jjb/integration/*.sh
+    jjb/integration/include-raw-integration-compare-distributions.sh,
+    jjb/integration/include-raw-integration-configure-clustering.sh,
+    jjb/integration/include-raw-integration-deploy-controller-offline.sh,
+    jjb/integration/include-raw-integration-deploy-controller-run-test.sh,
+    jjb/integration/include-raw-integration-deploy-controller-verify.sh,
+    jjb/integration/include-raw-integration-deploy-openstack-run-test.sh,
+    jjb/integration/include-raw-integration-distribution-check.sh,
+    jjb/integration/include-raw-integration-get-bundle-url-root.sh,
+    jjb/integration/include-raw-integration-get-bundle-url.sh,
+    jjb/integration/include-raw-integration-get-bundle-vars.sh,
+    jjb/integration/include-raw-integration-get-slave-addresses.sh,
+    jjb/integration/include-raw-integration-list-jobs.sh,
+    jjb/integration/include-raw-integration-multipatch-distribution-test.sh,
+    jjb/integration/include-raw-integration-replace-block-text.sh,
+    jjb/integration/include-raw-integration-start-cluster-run-test.sh,
+    jjb/integration/include-raw-integration-replace-block-text.sh,
+    jjb/integration/include-raw-integration-start-cluster-run-test.sh
 shell = bash
 indent_size = 4
 use_spaces = yeah

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index eb81e29fa6b1ef9aecb2e1ecfae33b0a1a4f88c8..6ad635cdc16fa34f68c65a7e6249d5b4581f1399 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -10,14 +10,15 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-ROBOT_VENV=`mktemp -d --suffix=robot_venv`
-echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
+ROBOT_VENV=$(mktemp -d --suffix=robot_venv)
+echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 
 # The --system-site-packages parameter allows us to pick up system level
 # installed packages. This allows us to bake matplotlib which takes very long
 # to install into the image.
-virtualenv --system-site-packages ${ROBOT_VENV}
-source ${ROBOT_VENV}/bin/activate
+virtualenv --system-site-packages "${ROBOT_VENV}"
+# shellcheck disable=SC1090
+source "${ROBOT_VENV}/bin/activate"
 
 set -exu
 
@@ -25,8 +26,11 @@ set -exu
 pip install --upgrade pip
 
 pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon
-pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
-pip install --upgrade robotframework-pycurllibrary
+pip install --upgrade robotframework-httplibrary \
+    robotframework-requests \
+    robotframework-sshlibrary \
+    robotframework-selenium2library \
+    robotframework-pycurllibrary
 
 # Module jsonpath is needed by current AAA idmlite suite.
 pip install --upgrade jsonpath-rw

diff --git a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
index 00dd9e42e25171cf254a676b15215a769c0dbdb2..b1fbae329b511a647a37389de6597bf4e1541fcb 100644 (file)
--- a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
+++ b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Make sure changes merged after patch creation are applied.
 
 set -exu