adding more sleep time for -all- jobs

Change-Id: Ibfb5dd6971382fe742db9401f55b96d2de020cff
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 2846e9d975831d7b618601221f5bdb01292a7c7f..9cc405ddb75b3dfeab0a8d4a73a42005289221c8 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -9,8 +9,10 @@ CONTROLLERMEM="2048m"
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
     ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
     CONTROLLERMEM="3072m"
+    COOLDOWN_PERIOD="180"
 else
     ACTUALFEATURES="${CONTROLLERFEATURES}"
+    COOLDOWN_PERIOD="60"
 fi
 # Some versions of jenkins job builder result in feature list containing spaces
 # and ending in newline. Remove all that.
@@ -102,8 +104,8 @@ while true; do
     fi
 done
 
-echo "Cool down for 1 min :)..."
-sleep 60
+echo "Cool down for \${COOLDOWN_PERIOD} seconds :)..."
+sleep ${COOLDOWN_PERIOD}
 
 echo "Listing all open ports on controller system..."
 netstat -natu

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 225dc0f21d71d4cc8c55ae0344e3a1c26109ecdc..336c884158ae55db061cb2e580b9f1ecee19ac73 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -67,8 +67,13 @@ do
     ssh ${!CONTROLLERIP} "bash /tmp/verify-cluster-is-up.sh ${i} ${!CONTROLLERIP}"
 done
 
-echo "Cool down for 1 min :)..."
-sleep 60
+if [ ${CONTROLLERSCOPE} == 'all' ]; then
+    COOLDOWN_PERIOD="180"
+else
+    COOLDOWN_PERIOD="60"
+fi
+echo "Cool down for ${COOLDOWN_PERIOD} seconds :)..."
+sleep ${COOLDOWN_PERIOD}
 
 echo "Changing the testplan path..."
 cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt