X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=d0a4fe1f4d30c9f38955f99bc1e3af6c77554582;hb=67a3447f8a7a25812b4efecfd9be5dafd4f0e293;hp=dd9cc9b1bd9b93d2d2e8bb4662174d0cc20b97ac;hpb=0bc87527a95d1c5afc7725981ef0a2e3f55fd274;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index dd9cc9b1..d0a4fe1f 100644 --- a/jenkins/ci-pipelines/ci_stage_2.groovy +++ b/jenkins/ci-pipelines/ci_stage_2.groovy @@ -52,7 +52,8 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa container_name = "${project}-${branch}".toLowerCase() stage('Docker-Build') { - sh "docker build -t ${container_name} ." + APT_PROXY = "http://172.21.1.1:3142" + sh "docker build --build-arg APT_PROXY=${APT_PROXY} -t ${container_name} ." } UID = sh(returnStdout:true, script: 'id -u').trim() @@ -116,7 +117,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa def downstream_params_stage_3 = [ string(name: 'GERRIT_BRANCH', value: "${branch}"), string(name: 'INSTALLER', value: "Default" ), - string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu18.04" ), + string(name: 'OPENSTACK_BASE_IMAGE', value: "ubuntu20.04" ), string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ), string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ), booleanParam(name: 'DO_STAGE_4', value: do_stage_4 )