X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fhost%2Fstart_build;h=dd69799980c5d0daf9e984baf37900e5635b0aab;hb=d391b9a94323a5e1c6506903fe20ecdb654a1716;hp=09f471bb4bcbf482dae63dbd712aad0694386605;hpb=50c2e86ae38c7715bf60cf8f70bff7b319bfa683;p=osm%2Fdevops.git diff --git a/jenkins/host/start_build b/jenkins/host/start_build index 09f471bb..dd697999 100755 --- a/jenkins/host/start_build +++ b/jenkins/host/start_build @@ -28,18 +28,33 @@ export OSM_MDG=$1 OSM_load_config if ! container_exists $OSM_BUILD_CONTAINER; then - create_container $OSM_BASE_IMAGE $OSM_BUILD_CONTAINER + if [[ "$OSM_BUILD_CONTAINER_PRIVILEGED" == yes ]]; then + create_privileged_container $OSM_BASE_IMAGE $OSM_BUILD_CONTAINER + else + create_container $OSM_BASE_IMAGE $OSM_BUILD_CONTAINER + fi wait_container_up $OSM_BUILD_CONTAINER RE="fedora|fc[0-9]" if [[ $OSM_BASE_IMAGE =~ $RE ]]; then - container_exec $OSM_BUILD_CONTAINER yum -y install git + container_exec $OSM_BUILD_CONTAINER yum -y install git tar else - container_exec $OSM_BUILD_CONTAINER apt install git + container_exec $OSM_BUILD_CONTAINER apt -y install git realpath fi - container_exec $OSM_BUILD_CONTAINER git clone ${OSM_GIT_URL}/devops + 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 - container_exec $OSM_BUILD_CONTAINER git -C devops pull + 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 +RC=$? +INFO "$OSM_MDG build complete. Return code was $RC" +exit $RC +