From 69861b8e009aecb30a25045c803655c6654640b0 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Tue, 14 Nov 2017 17:07:41 -0500 Subject: [PATCH] use upstream job -merge artifacts for stage_3 Signed-off-by: Mike Marchetti --- jenkins/ci-pipelines/ci_stage_3.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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") } -- 2.25.1