From: prithiv <prithiv.mohan@intel.com>
Date: Fri, 3 Feb 2017 11:12:12 +0000 (+0100)
Subject: Replaces ping with curl for environments with proxy. Bug #126
X-Git-Tag: v1.1.0~10
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F66%2F1066%2F4;p=osm%2Fdevops.git

Replaces ping with curl for environments with proxy. Bug #126

Change-Id: I5df0d408470dbb679fbd24e6d41c0ebb0b32b4d1
Signed-off-by: prithiv <prithiv.mohan@intel.com>
---

diff --git a/jenkins/common/container b/jenkins/common/container
index a43bae9d..e29d5eb3 100644
--- a/jenkins/common/container
+++ b/jenkins/common/container
@@ -60,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