X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=180e9be98ea3c642fa6221732807f7f00d393b72;hb=8fd3663e06cc425323ab119de9bb15f478529d30;hp=52e2f1d336a79b6bcd89c00786c3151778a1e9f7;hpb=9054244cd2a7451f75157d7fa3ec5d2ff88176be;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index 52e2f1d3..180e9be9 100644 --- a/jenkins/ci-pipelines/ci_stage_2.groovy +++ b/jenkins/ci-pipelines/ci_stage_2.groovy @@ -26,7 +26,7 @@ def project_checkout(url_prefix,project,refspec,revision) { } } -def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifactory_server,docker_args="",do_stage_4=false) { +def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3=false,artifactory_server,docker_args="",do_stage_4=false) { println("do_stage_3= ${do_stage_3}") ci_helper = load "devops/jenkins/ci-pipelines/ci_helper.groovy" @@ -59,13 +59,12 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa stage('Build') { sh(returnStdout:true, script: 'devops-stages/stage-build.sh').trim() } - } - - stage('Archive') { - sh "mkdir -p changelog" - sh "devops/tools/generatechangelog-pipeline.sh > changelog/changelog-${mdg}.html" - sh(returnStdout:true, script: 'devops-stages/stage-archive.sh').trim() - ci_helper.archive(artifactory_server,mdg,branch,'untested') + stage('Archive') { + sh "mkdir -p changelog" + sh "devops/tools/generatechangelog-pipeline.sh > changelog/changelog-${mdg}.html" + sh(returnStdout:true, script: 'devops-stages/stage-archive.sh').trim() + ci_helper.archive(artifactory_server,mdg,branch,'untested') + } } if ( do_stage_3 ) {