Merge "GBP Vagrant setup for Ubuntu VM"

[releng/builder.git] / jjb / integration / include-raw-integration-start-cluster-run-test.sh

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 6059b84a746ae9a13750c350ebe56a40d3ce8d6f..5255db883d21287e9f304c9aa3c3064b6982ebec 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -1,3 +1,8 @@
+# Activate robotframework virtualenv
+# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
+# script.
+source ${ROBOT_VENV}/bin/activate
+
 echo "#################################################"
 echo "##         Verify Cluster is UP                ##"
 echo "#################################################"
@@ -37,9 +42,9 @@ EOF
 CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
 for i in "${!CONTROLLERIPS[@]}"
 do
-    echo “Verifying member-$i with IP address ${CONTROLLERIPS[$i]} is UP”
+    echo "Verifying member-$((i+1)) with IP address ${CONTROLLERIPS[$i]} is UP"
     scp ${WORKSPACE}/verify-cluster-is-up.sh ${CONTROLLERIPS[$i]}:/tmp
-    ssh ${CONTROLLERIPS[$i]} "bash /tmp/verify-cluster-is-up.sh $i ${CONTROLLERIPS[$i]}"
+    ssh ${CONTROLLERIPS[$i]} "bash /tmp/verify-cluster-is-up.sh $((i+1)) ${CONTROLLERIPS[$i]}"
 done
 
 echo "Cool down for 1 min :)..."
@@ -54,7 +59,8 @@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
 -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${CONTROLLER0} -v CONTROLLER1:${CONTROLLER1} -v CONTROLLER2:${CONTROLLER2} \
--v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
+-v CONTROLLER_USER:${USER} -v MININET:${MININET0} -v MININET1:${MININET1} -v MININET2:${MININET2} \
+-v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 
 echo "Fetching Karaf log"
 scp $CONTROLLER0:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller0-karaf.log