Fix: sourced files w/o arg bashisms

[releng/builder.git] / jjb / integration / integration-apex-run-tests.sh

diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh
index 6ce6d5c01c2b0a5ea87839910b0fc457ab0ad65f..980f590a0cc79eb00f46c3a8548f8c7e62e24fdd 100644 (file)
--- a/jjb/integration/integration-apex-run-tests.sh
+++ b/jjb/integration/integration-apex-run-tests.sh
@@ -3,7 +3,7 @@
 # ${ROBOT_VENV} comes from the integration-install-robotframework.sh
 # script.
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
-source "${ROBOT_VENV}/bin/activate"
+. "${ROBOT_VENV}/bin/activate"
 source /tmp/common-functions.sh "${BUNDLEFOLDER}"
 # Ensure we fail the job if any steps fail.
 set -ex -o pipefail
@@ -45,7 +45,7 @@ ssh "$OPENSTACK_COMPUTE_NODE_2_IP" "sudo bash /tmp/extra_node_configs.sh"
 
 USER=heat-admin
 openstack object save OPNFV-APEX-SNAPSHOTS overcloudrc
-source overcloudrc
+. overcloudrc
 cat overcloudrc
 openstack hypervisor list
 
@@ -130,7 +130,7 @@ for suite in ${SUITES}; do
     suite_name="$(basename "${suite}" | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
     robot -N "${log_name}" \
-    -c critical -e exclude -e "skip_if_${DISTROSTREAM}" -e NON_GATE \
+    -e exclude -e "skip_if_${DISTROSTREAM}" -e NON_GATE \
     --log "log_${log_name}.html" --report "report_${log_name}.html" --output "output_${log_name}.xml" \
     --removekeywords wuks \
     --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \
@@ -171,6 +171,7 @@ for suite in ${SUITES}; do
     -v SSH_KEY:robot_id_rsa \
     -v TOOLS_SYSTEM_IP: \
     -v USER_HOME:"${HOME}" \
+    -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
     -v WORKSPACE:/tmp \
     "${TESTOPTIONS}" "${suite}" || true
 done