X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-distribution-check.sh;h=b245cac555112d30cb8f4bc012636eb58e5166af;hb=1607e6a3c92e19746a19659c354889480a4a652d;hp=1f6b03b224dffc2ea324116a224b24894cf754a3;hpb=5a6ea423022e8d3e663097d510513dde2a56b7e9;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 1f6b03b22..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
@@ -54,9 +54,15 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "JDK Version should be overriden by JAVA_HOME"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+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
@@ -70,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 ))
@@ -80,13 +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..."
-sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
+# 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"
@@ -118,6 +136,7 @@ exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .