X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fcommon%2Fcontainer;h=e29d5eb3028148661b40b953436da95f154e184c;hb=49461294d0896c910a93aa18e20ba10f6bef38b3;hp=d959f8f309565182b4ffe9c5f6617359acb45225;hpb=ee04b4563003e33e11163adbbaa39e5c7091d82f;p=osm%2Fdevops.git

diff --git a/jenkins/common/container b/jenkins/common/container
index d959f8f3..e29d5eb3 100644
--- a/jenkins/common/container
+++ b/jenkins/common/container
@@ -42,7 +42,7 @@ create_container() {
 	container=$2
 	shift 2
 	DEBUG "lxc launch $image $container $*"
-	lxc launch "$image" "$container" "$*"
+	lxc launch "$image" "$container" $*
 }
 
 container_exec() { 
@@ -51,6 +51,7 @@ container_exec() {
 	DEBUG "exec in $container \"$*\""
 	lxc exec "$container" -- $*
 }
+
 container_exec_stderr() { 
 	container="$1"
 	shift
@@ -59,21 +60,21 @@ container_exec_stderr() {
 }
 
 wait_container_up() {
-	[ $# -eq 1 ] || FATAL "arg is container name got $# args - $*"
-	ct=0
-	RE="1 received"
-	while [ $ct -lt 60 ]; do
-		let ct=ct+1
-		output=$(container_exec_stderr "$1" ping -c 1 google.com)
-		if [[ $output =~ $RE ]]; then	
-			DEBUG "$1 is up"
-			return
-		fi
-		INFO "waiting for container $1 to start"
-		DEBUG "expected '$RE' in $output"
-		sleep 1
-	done
-	FATAL "container $1 did not start"
+    [ $# -eq 1 ] || FATAL "arg is container name got $# args - $*"
+    RE="200"
+    ct=0
+    while [ $ct -lt 10 ]; do
+        let ct=ct+1
+        output=$(container_exec_stderr "$1" curl -sL -w "%{http_code}\\n" "http://www.google.com/" -o /dev/null)
+        if [[ $output =~ $RE ]]; then
+            DEBUG "$1 is up"
+            return
+        fi
+        INFO "waiting for container $1 to start"
+        DEBUG "expected '$RE' in $output"
+        sleep 5
+    done
+    FATAL "container $1 did not start"
 }
 container_push_tree() { 
     # create a tarball locally, pipe it into the container and unpack it there