Merge "Move unimgr Sonar scan to Sonarcloud"

[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 2c9a2a17aa8624fddf434ce6d55a29317a3a82a6..baae769d8d977cc143397103db6951a0e68b5945 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -18,6 +18,8 @@ nodes_list=$(get_nodes_list)
 
 run_plan "script"
 
+add_jvm_support
+
 create_configuration_script
 
 create_startup_script
@@ -32,7 +34,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"
@@ -49,6 +51,8 @@ done
 get_test_suites SUITES
 
 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}" \
       -v BUNDLEFOLDER:"${BUNDLEFOLDER}" \
@@ -76,17 +80,11 @@ 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 \
-      "${TESTOPTIONS}" "${SUITES}" || true
+      ${TESTOPTIONS} ${SUITES} || true
 
 echo "Examining the files in data/log and checking filesize"
 # shellcheck disable=SC2029
@@ -97,7 +95,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}"