Run new MDSAL CSIT to the weekly MRI test

[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 e04cfd7bddb100c014704f8941e6d691c5271942..5053957a31ba8bdb88970031fdb9172f4afb3663 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -1,5 +1,10 @@
 #!/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.
@@ -7,6 +12,7 @@
 source "${ROBOT_VENV}/bin/activate"
 source /tmp/common-functions.sh "${BUNDLEFOLDER}"
 
+
 echo "#################################################"
 echo "##         Configure Cluster and Start         ##"
 echo "#################################################"
@@ -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
 
@@ -95,7 +102,7 @@ ssh "${ODL_SYSTEM_IP}" "du -hs /tmp/${BUNDLEFOLDER}/data/log/*"
 for i in $(seq 1 "${NUM_ODL_SYSTEM}")
 do
     CONTROLLERIP="ODL_SYSTEM_${i}_IP"
-    echo "Lets's take the karaf thread dump again..."
+    echo "Let's take the karaf thread dump again..."
     ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_after.log
     pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}/ps_after.log" | grep -v grep | tr -s ' ' | cut -f2 -d' ')
     echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"