From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Thu, 16 Nov 2017 13:56:10 +0000 (-0500)
Subject: use job name for container name
X-Git-Tag: v3.0.2~19^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8940bcd1c21d99b3f840bcfb2af225a1f8e11c44;p=osm%2Fdevops.git

use job name for container name

Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 8b4231c6..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
@@ -54,11 +52,14 @@ node("${params.NODE}") {
 
     // 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') ) {
         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") {