From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 2 Oct 2018 17:01:28 +0000 (-0700)
Subject: Adjust controller ready script
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ed2d30f6ccd8a48723ed1cbec12b98613af88f44;p=releng%2Fbuilder.git

Adjust controller ready script

So it does not depend on bundle generating the "ready" message.

Change-Id: Ic89310791fc3a9fae5460833d3b14bc0db4beb46
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index e3499828b..f2c7dee72 100644
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -740,7 +740,7 @@ fi
 echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
 for i in {1..36}; do
     sleep 5;
-    grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+    grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
     if [ \$? -eq 0 ]; then
         echo "Controller is UP"
         break
@@ -748,7 +748,7 @@ for i in {1..36}; do
 done;
 
 # if we ended up not finding ready status in the above loop, we can output some debugs
-grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
 if [ $? -ne 0 ]; then
     echo "Timeout Controller DOWN"
     echo "Dumping first 500K bytes of karaf log..."
diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 9e988fe3b..36bbfd705 100644
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -93,7 +93,7 @@ while true; do
     COUNT=$(( ${COUNT} + 5 ))
     sleep 5
     echo "already waited ${COUNT} seconds..."
-    if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
+    if grep --quiet 'org.opendaylight.infrautils.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo "Controller is UP"
         break
     elif (( "${COUNT}" >= "360" )); then