X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-start-cluster-run-test.sh;h=6bd0f15af9c30ac410f2d3eba27fc5c054ccbdab;hb=a2e762249ad0bc66aeae29f10871d9664063ad79;hp=257fb5c90645d8d240f847c4341cca8d459be7a7;hpb=32d8ada270f253f7b2c02d4c0aabd8c0f04b138d;p=releng%2Fbuilder.git

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 257fb5c90..6bd0f15af 100644
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -1,65 +1,26 @@
-echo "#########################################################"
-echo "##  include-raw-integration-start-cluster-run-test.sh  ##"
-echo "#########################################################"
-# Expects $BUNDLEFOLDER to be set earlier in Jenkins job.
-set -x
+echo "#################################################"
+echo "##         Verify Cluster is UP                ##"
+echo "#################################################"
 
-  if [ -z ${BUNDLEFOLDER} ] || [ -f ${BUNDLEFOLDER} ]; then
-    echo "Location of ODL BUNDLEFOLDER:$BUNDLEFOLDER is not defined"
-    exit 1
-  fi
-
-# populate $(CONTROLLERIPS)
-
-  declare CONTROLLERIPS=($(cat slave_addresses.txt | grep CONTROLLER | awk -F = '{print $2}'))
-  declare -p CONTROLLERIPS
-
-# Creates a script to run controller inside a dynamic jenkins slave
-
-cat > ${WORKSPACE}/run-startandtest-controller-script.sh <<EOF
-set -x
-cd /tmp
-cd ${BUNDLEFOLDER}
-echo "BUNDLE: $BUNDLEFOLDER"
-echo "Checking status of controller..."
-    bash bin/status
-    bash bin/start &
-set +x
-EOF
-
-
-
-cat > ${WORKSPACE}/run-verify-controller-isup-script.sh <<EOF
-set -x
-cd /tmp
-cd ${BUNDLEFOLDER}
-echo "BUNDLE: $BUNDLEFOLDER"
-echo "Checking status of controller..."
- bash bin/status
- echo "Waiting for controller to come up..."
- COUNT="0"
+cat > ${WORKSPACE}/verify-cluster-is-up.sh <<EOF
 
+CONTROLLERID="member-\$1"
+CONTROLLERIP=\$2
 
+echo "Waiting for controller to come up..."
+COUNT="0"
 while true; do
     RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )"
     echo \$RESP
-    if [[ \$RESP == *"200"* ]]; then
+    SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=\$CONTROLLERID-shard-inventory-config,type=DistributedConfigDatastore)"
+    echo \$SHARD
+    if ([[ \$RESP == *"200"* ]] && [[ \$SHARD  == *'"status":200'* ]]); then
         echo Controller is UP
-    SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-0-shard-inventory-config,type=DistributedConfigDatastore)"
-      echo \$SHARD
-      if [[ \$SHARD  == *'"status":200'* ]]
-       then
         break
-      fi
-      break
-
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        ls
-        pwd
-        cd data/log
-        cat karaf.log
+        cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log
         exit 1
     else
         COUNT=\$(( \${COUNT} + 5 ))
@@ -68,34 +29,17 @@ while true; do
     fi
 done
 
-cd /tmp/${BUNDLEFOLDER}/bin/
-
 echo "Checking OSGi bundles..."
-sshpass -p karaf ./client -u karaf 'bundle:list'
+sshpass -p karaf /tmp/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
 
 EOF
 
-
-for  i in "${!CONTROLLERIPS[@]}"
+CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
+for i in "${!CONTROLLERIPS[@]}"
 do
- echo "Copying HERE docs to ${CONTROLLERIPS[$i]} which is node $i "
- scp ${WORKSPACE}/run-startandtest-controller-script.sh \
-${CONTROLLERIPS[$i]}:/tmp
-
- scp ${WORKSPACE}/run-verify-controller-isup-script.sh \
-${CONTROLLERIPS[$i]}:/tmp
-done
-
-for  i in "${!CONTROLLERIPS[@]}"
-do
- echo "Starting ${CONTROLLERIPS[$i]} on node $i "
- ssh ${CONTROLLERIPS[$i]} "bash /tmp/run-startandtest-controller-script.sh $i"&
-done
-
-for  i in "${!CONTROLLERIPS[@]}"
-do
- echo "Running sanity tests on ${CONTROLLERIPS[$i]} on node $i "
- ssh ${CONTROLLERIPS[$i]} "bash /tmp/run-verify-controller-isup-script.sh $i"
+    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+1)) ${CONTROLLERIPS[$i]}"
 done
 
 echo "Cool down for 1 min :)..."
@@ -108,30 +52,15 @@ cat testplan.txt
 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}
-
+-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 controller0-karaf.log ############"
-scp $CONTROLLER0:/tmp/$BUNDLEFOLDER/data/log/karaf.log \
-controller0-karaf.log
-# cat karaf.log
-#
-echo "######  Fetching controller1-karaf.log ############"
-scp $CONTROLLER1:/tmp/$BUNDLEFOLDER/data/log/karaf.log \
-controller1-karaf.log
-# cat controller1-karaf.log
+echo "Fetching Karaf log"
+scp $CONTROLLER0:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller0-karaf.log
+scp $CONTROLLER1:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller1-karaf.log
+scp $CONTROLLER2:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller2-karaf.log
 
-echo "######  Fetching controller2-karaf.log ############"
-scp $CONTROLLER2:/tmp/$BUNDLEFOLDER/data/log/karaf.log \
-controller2-karaf.log
-# cat controller2-karaf.log
+# vim: ts=4 sw=4 sts=4 et ft=sh :
 
-## vim: ts=4 sw=4 sts=4 et ft=sh :
-echo "############################################################"
-echo "## END include-raw-integration-start-cluster-run-test.sh  ##"
-echo "############################################################"