From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 20 Sep 2016 14:46:16 +0000 (+0200)
Subject: Bug fixed about container creation with parameters. Minor typos fixed: tab vs space
X-Git-Tag: v1.0.0~18
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=db26f3c90d0139edd02bf06c7689f94259f57513;p=osm%2Fdevops.git

Bug fixed about container creation with parameters. Minor typos fixed: tab vs space

Change-Id: I64237e6840b10c134a8376de92fd04a882f204da
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/jenkins/common/container b/jenkins/common/container
index d959f8f3..a43bae9d 100644
--- a/jenkins/common/container
+++ b/jenkins/common/container
@@ -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
diff --git a/jenkins/host/start_build b/jenkins/host/start_build
index 41ea0684..45d495f2 100755
--- a/jenkins/host/start_build
+++ b/jenkins/host/start_build
@@ -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 $*