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

diff --git a/jenkins/common/container b/jenkins/common/container
index 3c09d7f2..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
@@ -55,6 +55,12 @@ container_exec() {
 	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 - $*"
@@ -62,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
@@ -73,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"
+}