Merge "refactored the git checkout code"

[osm/devops.git] / jenkins / common / container

diff --git a/jenkins/common/container b/jenkins/common/container
index 5c0ef95..a43bae9 100644 (file)
--- 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,12 +17,13 @@
 #
 # container_funcs
 # 24 June 2016 -- Jeremy Mordkoff -- Genesis
+#              -- Gerardo García
 
 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
@@ -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() { 
@@ -56,13 +52,20 @@ container_exec() {
        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 - $*"
        ct=0
        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