Merge "Auto Update CSIT Jobs to run for nitrogen"

[releng/builder.git] / jjb / integration / integration-distribution-check.sh

diff --git a/jjb/integration/integration-distribution-check.sh b/jjb/integration/integration-distribution-check.sh
index 3099a010dbc8a7dcf16319d570760f7103e4c58d..d4ffea9cdd3bcff8939ddbbbdddb799aa92269f9 100644 (file)
--- a/jjb/integration/integration-distribution-check.sh
+++ b/jjb/integration/integration-distribution-check.sh
@@ -9,8 +9,8 @@ BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSI
 echo "Kill any controller running"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
-echo "Clean workspace"
-rm -rf *
+echo "Clean Existing distribution"
+rm -rf ${BUNDLEFOLDER}
 
 echo "Copying the distribution..."
 cp "${BUNDLE_PATH}" .
@@ -84,9 +84,11 @@ while true; do
         netstat -pnatu
         exit 1
     else
-        COUNT="$(( ${COUNT} + 5 ))"
-        sleep 5
-        echo waiting "${COUNT}" secs...
+        COUNT=$(( ${COUNT} + 1 ))
+        sleep 1
+        if [[ $(($COUNT % 5)) == 0 ]]; then
+            echo already waited ${COUNT} seconds...
+        fi
     fi
 done