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

diff --git a/jenkins/common/container b/jenkins/common/container
index 400e38aa..e29d5eb3 100644
--- a/jenkins/common/container
+++ b/jenkins/common/container
@@ -1,6 +1,7 @@
 # This file is meant to be SOURCED
 #
 #   Copyright 2016 RIFT.IO Inc
+#   Copyright 2016 Telefónica Investigación y Desarrollo S.A.U.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -16,6 +17,7 @@
 #
 # container_funcs
 # 24 June 2016 -- Jeremy Mordkoff -- Genesis
+#              -- Gerardo García
 
 container_exists() { 
 	if [ $# -ne 1 ]; then
@@ -32,21 +34,15 @@ container_exists() {
 }
 
 create_container() { 
-	if [ $# -ne 2 ]; then
-		FATAL "args are image container"
+	if [ $# -lt 2 ]; then
+		FATAL "args are image container [options]"
 	fi
 	INFO "creating container $2 using image $1"
-	DEBUG "lxc launch $1 $2"
-	lxc launch "$1" "$2"
-}
-
-create_privileged_container() {
-	if [ $# -ne 2 ]; then
-		FATAL "args are image container"
-	fi
-	INFO "creating container $2 using image $1"
-	DEBUG "lxc launch $1 $2"
-	lxc launch "$1" "$2" -c security.privileged=true
+	image=$1
+	container=$2
+	shift 2
+	DEBUG "lxc launch $image $container $*"
+	lxc launch "$image" "$container" $*
 }
 
 container_exec() { 
@@ -55,6 +51,7 @@ container_exec() {
 	DEBUG "exec in $container \"$*\""
 	lxc exec "$container" -- $*
 }
+
 container_exec_stderr() { 
 	container="$1"
 	shift
@@ -63,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