From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Fri, 25 Aug 2017 14:06:49 +0000 (-0400)
Subject: define stage for stage_1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2d4312ab2ffe08a377b1d079c4b463f862ef708d;hp=d961f4713d22758bfd18c4eab562905c715caca7;p=osm%2Fdevops.git

define stage for stage_1

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

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index 32044091..be7d9080 100644
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -35,25 +35,27 @@ node("${params.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")
+        }
     }
 }