Merge "Change interface mtus"

[releng/builder.git] / jjb / integration / common-functions.sh

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 48280d1cd994eadf9bc5ec47882d36e4c676cc70..f2c7dee72254bbb33f66776a1cf0bdf680ecfd33 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -419,6 +419,7 @@ EOF
 
     mv /tmp/changes.txt ${WORKSPACE}/archives
     mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives
+    mv ${WORKSPACE}/haproxy.cfg ${WORKSPACE}/archives
 
     sleep 5
     # FIXME: Do not create .tar and gzip before copying.
@@ -739,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
@@ -747,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..."