From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Tue, 14 Nov 2017 22:07:41 +0000 (-0500)
Subject: use upstream job -merge artifacts for stage_3
X-Git-Tag: v3.0.2~21
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F5688%2F1;p=osm%2Fdevops.git

use upstream job -merge artifacts for stage_3

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 ba406e5d..8b4231c6 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -52,8 +52,10 @@ node("${params.NODE}") {
     def upstream_main_job = params.UPSTREAM_SUFFIX
     def save_artifacts = false
 
+    // upstream jobs always use merged artifacts
+    upstream_main_job += '-merge'
+
     if ( JOB_NAME.contains('merge') ) {
-        upstream_main_job += '-merge'
         save_artifacts = true
         println("merge job, saving artifacts")
     }