Bug fixed about container creation with parameters. Minor typos fixed: tab vs space 63/363/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 20 Sep 2016 14:46:16 +0000 (16:46 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 20 Sep 2016 14:46:16 +0000 (16:46 +0200)
Change-Id: I64237e6840b10c134a8376de92fd04a882f204da
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
jenkins/common/container
jenkins/host/start_build

index d959f8f..a43bae9 100644 (file)
@@ -42,7 +42,7 @@ create_container() {
        container=$2
        shift 2
        DEBUG "lxc launch $image $container $*"
-       lxc launch "$image" "$container" "$*"
+       lxc launch "$image" "$container" $*
 }
 
 container_exec() { 
@@ -51,6 +51,7 @@ container_exec() {
        DEBUG "exec in $container \"$*\""
        lxc exec "$container" -- $*
 }
+
 container_exec_stderr() { 
        container="$1"
        shift
index 41ea068..45d495f 100755 (executable)
@@ -42,17 +42,17 @@ if ! container_exists $OSM_BUILD_CONTAINER; then
        else
                container_exec $OSM_BUILD_CONTAINER apt -y install git realpath make sudo 
        fi
-    if [ ${OSM_USE_LOCAL_DEVOPS:-false} ]; then
-        container_push_devops $OSM_BUILD_CONTAINER
-    else
-           container_exec $OSM_BUILD_CONTAINER git clone ${OSM_GIT_URL}/devops
-    fi
+       if [ ${OSM_USE_LOCAL_DEVOPS:-false} ]; then
+               container_push_devops $OSM_BUILD_CONTAINER
+       else
+               container_exec $OSM_BUILD_CONTAINER git clone ${OSM_GIT_URL}/devops
+       fi
 else
-    if [ ${OSM_USE_LOCAL_DEVOPS:-false} ]; then
-        container_push_devops $OSM_BUILD_CONTAINER
-    else
-           container_exec $OSM_BUILD_CONTAINER git -C devops pull
-    fi
+       if [ ${OSM_USE_LOCAL_DEVOPS:-false} ]; then
+               container_push_devops $OSM_BUILD_CONTAINER
+       else
+               container_exec $OSM_BUILD_CONTAINER git -C devops pull
+       fi
 fi
 
 container_exec $OSM_BUILD_CONTAINER ./devops/jenkins/$OSM_MDG/start_build $*