X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=082f7283a5a3b70724b04a4780ab7039d24fe488;hb=refs%2Fchanges%2F92%2F5692%2F1;hp=ba406e5d364fe27a69b865b160abdb9ee5349e50;hpb=9aafb3fb1f3da54c60fa695aa45c4a07c107918a;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index ba406e5d..082f7283 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -40,8 +40,6 @@ node("${params.NODE}") {
     sh 'env'
 
     tag_or_branch = params.GERRIT_BRANCH.replaceAll(/\./,"")
-    container_name_prefix = "osm-${tag_or_branch}" 
-    container_name = "${container_name_prefix}-${BUILD_NUMBER}"
 
     stage("Checkout") {
         checkout scm
@@ -52,11 +50,16 @@ node("${params.NODE}") {
     def upstream_main_job = params.UPSTREAM_SUFFIX
     def save_artifacts = false
 
+    // upstream jobs always use merged artifacts
+    upstream_main_job += '-merge'
+    container_name_prefix = "osm-${tag_or_branch}"
+    container_name = "${container_name_prefix}"
     if ( JOB_NAME.contains('merge') ) {
-        upstream_main_job += '-merge'
         save_artifacts = true
         println("merge job, saving artifacts")
+        container_name += "-merge"
     }
+    container_name += "-${BUILD_NUMBER}"
 
     // Copy the artifacts from the upstream jobs
     stage("Copy Artifacts") {