commit 69861b8e009aecb30a25045c803655c6654640b0
author Mike Marchetti <mmarchetti@sandvine.com> Tue Nov 14 17:07:41 2017 -0500
committer Mike Marchetti <mmarchetti@sandvine.com> Tue Nov 14 17:07:41 2017 -0500
tree 7e28862e7f15dd9c03bee07c11f0e0f04285e6cc
parent 9aafb3fb1f3da54c60fa695aa45c4a07c107918a

use upstream job -merge artifacts for stage_3

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

jenkins/ci-pipelines/ci_stage_3.groovy

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index ba406e5..8b4231c 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -52,8 +52,10 @@
     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")
     }