diff --git a/jenkins/common/container b/jenkins/common/container index d959f8f309565182b4ffe9c5f6617359acb45225..a43bae9d6009c4cf543e142fc3d9ddba94cfb521 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 41ea06842130e17cb600f051d86bf581cf8ab8a2..45d495f2a052e2b60413238be48b32eaaacadcc9 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 $*