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 e3499828b727d2529474efdb9f8cb55fa7c74627..f2c7dee72254bbb33f66776a1cf0bdf680ecfd33 100644 (file)
--- 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 9e988fe3b4a5939f48239191f4f2628d446d94a5..36bbfd705d6075366f51cfdc7768e4bf5199f073 100644 (file)
--- 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