X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fcommon-functions.sh;h=53ed46ada9c6fa5a09ffda094bfca2c8095fa7a3;hb=0209f258540405a719e0bf9d89bfc9e7ebf9d647;hp=e3499828b727d2529474efdb9f8cb55fa7c74627;hpb=0c768872e5b0a44b7b43cf85090816ba4cbcbd21;p=releng%2Fbuilder.git diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh index e3499828b..53ed46ada 100644 --- a/jjb/integration/common-functions.sh +++ b/jjb/integration/common-functions.sh @@ -418,8 +418,11 @@ EOF mkdir -p ${WORKSPACE}/archives mv /tmp/changes.txt ${WORKSPACE}/archives + mv /tmp/validations.txt ${WORKSPACE}/archives mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives mv ${WORKSPACE}/haproxy.cfg ${WORKSPACE}/archives + ssh ${OPENSTACK_HAPROXY_1_IP} "sudo journalctl -u haproxy > /tmp/haproxy.log" + scp ${OPENSTACK_HAPROXY_1_IP}:/tmp/haproxy.log ${WORKSPACE}/archives/ sleep 5 # FIXME: Do not create .tar and gzip before copying. @@ -740,7 +743,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 +751,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..."