Adding new job for odlmicro CSIT

[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 3a274190d8b8ac39543d90cfc750979696a385c6..28439606c2bdaf6c96d54ddb45e09024f2ee6551 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 "#################################################"
@@ -18,6 +24,8 @@ nodes_list=$(get_nodes_list)
 
 run_plan "script"
 
+add_jvm_support
+
 create_configuration_script
 
 create_startup_script
@@ -32,7 +40,7 @@ copy_and_run_startup_script
 
 copy_and_run_post_startup_script
 
-create_controller_variables
+dump_controller_threads
 
 if [ "${NUM_OPENSTACK_SYSTEM}" -gt 0 ]; then
    echo "Exiting without running tests to deploy openstack for testing"
@@ -78,13 +86,7 @@ robot -N "${TESTPLAN}" \
       -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" \
       -v ODL_SYSTEM_USER:"${USER}" \
       -v SUITES:"${SUITES}" \
-      -v TOOLS_SYSTEM_1_IP:"${TOOLS_SYSTEM_IP}" \
-      -v TOOLS_SYSTEM_2_IP:"${TOOLS_SYSTEM_2_IP}" \
-      -v TOOLS_SYSTEM_3_IP:"${TOOLS_SYSTEM_3_IP}" \
-      -v TOOLS_SYSTEM_4_IP:"${TOOLS_SYSTEM_4_IP}" \
-      -v TOOLS_SYSTEM_5_IP:"${TOOLS_SYSTEM_5_IP}" \
-      -v TOOLS_SYSTEM_6_IP:"${TOOLS_SYSTEM_6_IP}" \
-      -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" \
+      -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
       -v WORKSPACE:/tmp \
@@ -99,7 +101,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}"