From 0bff497a70fbf700d31e79ed2e212bb4d1b4639b Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Fri, 25 Aug 2017 10:06:49 -0400 Subject: [PATCH] define stage for stage_1 Change-Id: I5a7a11b6ce2d542e583da86cc917e0e5852b4d74 Signed-off-by: Mike Marchetti --- jenkins/ci-pipelines/ci_stage_1.groovy | 38 ++++++++++++++------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy index c345e940..a5adb9e5 100644 --- a/jenkins/ci-pipelines/ci_stage_1.groovy +++ b/jenkins/ci-pipelines/ci_stage_1.groovy @@ -34,25 +34,27 @@ node { params.PROJECT_URL_PREFIX = 'https://osm.etsi.org/gerrit' } - // pipeline running from gerrit trigger. - // kickoff the downstream multibranch pipeline - def downstream_params = [ - string(name: 'GERRIT_BRANCH', value: GERRIT_BRANCH), - string(name: 'GERRIT_PROJECT', value: GERRIT_PROJECT), - string(name: 'GERRIT_REFSPEC', value: GERRIT_REFSPEC), - string(name: 'GERRIT_PATCHSET_REVISION', value: GERRIT_PATCHSET_REVISION), - string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX), - booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL), - ] + stage('downstream stage_2') { + // pipeline running from gerrit trigger. + // kickoff the downstream multibranch pipeline + def downstream_params = [ + string(name: 'GERRIT_BRANCH', value: GERRIT_BRANCH), + string(name: 'GERRIT_PROJECT', value: GERRIT_PROJECT), + string(name: 'GERRIT_REFSPEC', value: GERRIT_REFSPEC), + string(name: 'GERRIT_PATCHSET_REVISION', value: GERRIT_PATCHSET_REVISION), + string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX), + booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL), + ] - println("TEST_INSTALL = ${params.TEST_INSTALL}") - // callout to stage_2. This is a multi-branch pipeline. - upstream_job_name = "${mdg}-stage_2/${GERRIT_BRANCH}" + println("TEST_INSTALL = ${params.TEST_INSTALL}") + // callout to stage_2. This is a multi-branch pipeline. + upstream_job_name = "${mdg}-stage_2/${GERRIT_BRANCH}" - stage_2_result = build job: "${upstream_job_name}", parameters: downstream_params, propagate: true - if (stage_2_result.getResult() != 'SUCCESS') { - project = stage_2_result.getProjectName() - build = stage_2_result.getNumber() - error("${project} build ${build} failed") + stage_2_result = build job: "${upstream_job_name}", parameters: downstream_params, propagate: true + if (stage_2_result.getResult() != 'SUCCESS') { + project = stage_2_result.getProjectName() + build = stage_2_result.getNumber() + error("${project} build ${build} failed") + } } } -- 2.25.1