use upstream job -merge artifacts for stage_3 88/5688/1
authorMike Marchetti <mmarchetti@sandvine.com>
Tue, 14 Nov 2017 22:07:41 +0000 (17:07 -0500)
committerMike Marchetti <mmarchetti@sandvine.com>
Tue, 14 Nov 2017 22:07:41 +0000 (17:07 -0500)
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
jenkins/ci-pipelines/ci_stage_3.groovy

index ba406e5..8b4231c 100644 (file)
@@ -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")
     }