X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=d7b37655a75ebc8272eda95861187d3ec72eeb36;hb=refs%2Fchanges%2F83%2F6483%2F2;hp=52aa3b2fabb06bb85f9746cb2a0ea128c4223d45;hpb=515503e249283b6e0a2ccd5b4c134fa7a5572647;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 52aa3b2f..d7b37655 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -180,7 +180,8 @@ node("${params.NODE}") { sh """ export OSM_USE_LOCAL_DEVOPS=true - jenkins/host/start_build system --build-container ${container_name} \ + export PATH=$PATH:/snap/bin + installers/full_install_osm.sh -y -s ${container_name} --nolxd --nodocker --nojuju --nohostports \ ${commit_id} \ ${repo_distro} \ ${repo_base_url} \ @@ -235,15 +236,17 @@ node("${params.NODE}") { finally { sh "docker stop ${http_server_name}" - if (error) { - if ( !params.SAVE_CONTAINER_ON_FAIL ) { - sh "lxc delete ${container_name} --force" + if ( params.DO_INSTALL ) { + if (error) { + if ( !params.SAVE_CONTAINER_ON_FAIL ) { + sh "lxc delete ${container_name} --force" + } + throw error } - throw error - } - else { - if ( !params.SAVE_CONTAINER_ON_PASS ) { - sh "lxc delete ${container_name} --force" + else { + if ( !params.SAVE_CONTAINER_ON_PASS ) { + sh "lxc delete ${container_name} --force" + } } } }