X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-distribution-check.sh;h=b245cac555112d30cb8f4bc012636eb58e5166af;hb=8873bad57f334ad31d5007ca905d9d85253b93f9;hp=82c50b07b32f70358ecd845ae3a2ae96c1dd3c23;hpb=7ab3fd784625b957216cdb7ba4866effe0daea2a;p=releng%2Fbuilder.git diff --git a/jjb/integration/include-raw-integration-distribution-check.sh b/jjb/integration/include-raw-integration-distribution-check.sh index 82c50b07b..b245cac55 100644 --- a/jjb/integration/include-raw-integration-distribution-check.sh +++ b/jjb/integration/include-raw-integration-distribution-check.sh @@ -34,7 +34,7 @@ sed -ie "s/2048m/${CONTROLLERMEM}/g" ${MEMCONF} cat ${MEMCONF} echo "Listing all open ports on controller system" -netstat -natu +netstat -pnatu echo "redirected karaf console output to karaf_console.log" export KARAF_REDIRECT=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log @@ -60,6 +60,9 @@ export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" echo "Starting controller..." ${WORKSPACE}/${BUNDLEFOLDER}/bin/start +# No need for verbose printing during repeating operations. +set +x + echo "Waiting for controller to come up..." COUNT=0 while true; do @@ -73,7 +76,7 @@ while true; do echo "Dumping Karaf log..." cat ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log echo "Listing all open ports on controller system" - netstat -natu + netstat -pnatu exit 1 else COUNT=$(( ${COUNT} + 5 )) @@ -83,14 +86,25 @@ while true; do done echo "loading many features at once. Need to allow time for problems to show up in logs. cool down for 5 min ..." -sleep 300 +COUNT="300" +while true; do + if (( "${COUNT}" <= "0" )); then + break + fi + echo "${COUNT} seconds yet to wait..." + sleep 10 + COUNT=$(( ${COUNT} - 10 )) +done + +# End of repeating operations, enable verbose printing. +set -x -echo "Checking OSGi bundles..." +# echo "Checking OSGi bundles..." # sshpass seems to fail with new karaf version # sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list' echo "Listing all open ports on controller system" -netstat -natu +netstat -pnatu function exit_on_log_file_message { echo "looking for \"$1\" in karaf.log file"