Skip to content
Snippets Groups Projects
Commit db26f3c9 authored by garciadeblas's avatar garciadeblas
Browse files

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


Change-Id: I64237e6840b10c134a8376de92fd04a882f204da
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 8802d14a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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 $*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment