Fix: sourced files w/o arg bashisms

[releng/builder.git] / jjb / integration / integration-deploy-controller-run-test.sh

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index baae769d8d977cc143397103db6951a0e68b5945..ee5e91fc7e953b5cf8515156529d23e62ea254ee 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -1,12 +1,18 @@
 #!/bin/bash
 #@IgnoreInspection BashAddShebang
+
+if [ "${IS_KARAF_APPL}" = "False" ] ; then
+   echo "Not a Karaf Distro skipping karaf deployment"
+   exit
+fi
 # Activate robotframework virtualenv
 # ${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}"
 
+
 echo "#################################################"
 echo "##         Configure Cluster and Start         ##"
 echo "#################################################"
@@ -54,7 +60,7 @@ 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}" \
+      --removekeywords wuks -e exclude -e "skip_if_${DISTROSTREAM}" \
       -v BUNDLEFOLDER:"${BUNDLEFOLDER}" \
       -v BUNDLE_URL:"${ACTUAL_BUNDLE_URL}" \
       -v CONTROLLER:"${ODL_SYSTEM_IP}" \
@@ -83,6 +89,7 @@ robot -N "${TESTPLAN}" \
       -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
+      -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
       -v WORKSPACE:/tmp \
       ${TESTOPTIONS} ${SUITES} || true
 
@@ -91,6 +98,8 @@ echo "Examining the files in data/log and checking filesize"
 ssh "${ODL_SYSTEM_IP}" "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"
 # shellcheck disable=SC2029
 ssh "${ODL_SYSTEM_IP}" "du -hs /tmp/${BUNDLEFOLDER}/data/log/*"
+# shellcheck disable=SC2029
+ssh "${ODL_SYSTEM_IP}" "ls -lh /tmp/${BUNDLEFOLDER}/*.hprof"
 
 for i in $(seq 1 "${NUM_ODL_SYSTEM}")
 do