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

diff --git a/jenkins/common/container b/jenkins/common/container
index 89db8bab..400e38aa 100644
--- a/jenkins/common/container
+++ b/jenkins/common/container
@@ -21,7 +21,7 @@ container_exists() {
 	if [ $# -ne 1 ]; then
 		FATAL "arg is container name"
 	fi
-	lxc config show $1 2>&1 >/dev/null
+	lxc config show $1 >/dev/null 2>&1
 	if [ $? -eq 0 ]; then
 		DEBUG "container $1 exists"
 		return 0
@@ -37,15 +37,30 @@ create_container() {
 	fi
 	INFO "creating container $2 using image $1"
 	DEBUG "lxc launch $1 $2"
-	sudo 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
 }
 
 container_exec() { 
 	container="$1"
 	shift
-	DEBUG "exec in $1 \"$*\""
+	DEBUG "exec in $container \"$*\""
 	lxc exec "$container" -- $*
 }
+container_exec_stderr() { 
+	container="$1"
+	shift
+	DEBUG "exec in $container \"$*\""
+	lxc exec "$container" -- $* 2>&1
+}
 
 wait_container_up() {
 	[ $# -eq 1 ] || FATAL "arg is container name got $# args - $*"
@@ -53,7 +68,7 @@ wait_container_up() {
 	RE="1 received"
 	while [ $ct -lt 60 ]; do
 		let ct=ct+1
-		output=$(container_exec "$1" ping -c 1 google.com)
+		output=$(container_exec_stderr "$1" ping -c 1 google.com)
 		if [[ $output =~ $RE ]]; then	
 			DEBUG "$1 is up"
 			return
@@ -64,3 +79,14 @@ wait_container_up() {
 	done
 	FATAL "container $1 did not start"
 }
+container_push_tree() { 
+    # create a tarball locally, pipe it into the container and unpack it there
+	[ $# -eq 3 ] || FATAL "args are container dir_from dir_to (dir_to MUST exist)"
+    tar -C "$2" -c . -f - | container_exec $1 tar -C "$3" -x -f -
+}
+
+container_push_devops() { 
+	[ $# -eq 1 ] || FATAL "arg is container name got $# args - $*"
+    container_exec "$1" mkdir -p /root/devops
+    container_push_tree "$1" "$(dirname $OSM_JENKINS)" "/root/devops"
+}