Update releng/global-jjb repository information

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

diff --git a/jjb/integration/include-raw-integration-distribution-check.sh b/jjb/integration/include-raw-integration-distribution-check.sh
index f97e76bdebf8427131818e1b539916921b6fc348..01c6f02db1e1777595f7a5ffab3d0e303765a1d0 100644 (file)
--- a/jjb/integration/include-raw-integration-distribution-check.sh
+++ b/jjb/integration/include-raw-integration-distribution-check.sh
@@ -19,7 +19,7 @@ unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
 FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-sed -ie "s/featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${ACTUALFEATURES}/g" ${FEATURESCONF}
+sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
 sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" ${FEATURESCONF}
 cat ${FEATURESCONF}
 
@@ -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
@@ -83,9 +86,20 @@ 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'