X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_1.groovy;h=d74de59107c071299fb376b76dcccaf3279e7a09;hb=refs%2Fchanges%2F21%2F5721%2F1;hp=d6cf8369a716f857232801a5700bae11cfee8c35;hpb=58851d4eeed6f6de74432a46e9eeaa35bf1d569c;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index d6cf8369..d74de591 100644
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -36,6 +36,30 @@ node("${params.NODE}") {
     }
 
     stage('downstream') {
+        // default to stage_2 (patchset)
+        def stage_name = "stage_2"
+
+        try {
+            switch(GERRIT_EVENT_TYPE) {
+                case "change-merged":
+                   stage_name = "stage_2-merge"
+                   break
+
+                case "patchset-created":
+                   stage_name = "stage_2"
+                   break
+            }
+        }
+        catch(caughtError) {
+            println("No gerrit event found")
+        }
+
+        do_stage_4 = false
+        if (params.DO_STAGE_4)
+        {
+            do_stage_4 = params.DO_STAGE_4
+        }
+
         // pipeline running from gerrit trigger.
         // kickoff the downstream multibranch pipeline
         def downstream_params = [
@@ -45,13 +69,13 @@ node("${params.NODE}") {
             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),
+            booleanParam(name: 'DO_STAGE_4', value: do_stage_4),
         ]
-
-        stage_name = "stage_2"
+     
         if ( params.STAGE )
         {
             // go directly to stage 3 (osm system)
-            stage_name = "stage_3"
+            stage_name = params.STAGE
             mdg = "osm"
             if ( ! params.TEST_INSTALL )
             {
@@ -59,11 +83,12 @@ node("${params.NODE}") {
                 return
             }
         }
-        println("TEST_INSTALL = ${params.TEST_INSTALL}")
         // callout to stage_2.  This is a multi-branch pipeline.
-        upstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
+        downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
+
+        println("TEST_INSTALL = ${params.TEST_INSTALL}, downstream job: ${downstream_job_name}")
 
-        stage_2_result = build job: "${upstream_job_name}", parameters: downstream_params, propagate: true
+        stage_2_result = build job: "${downstream_job_name}", parameters: downstream_params, propagate: true
         if (stage_2_result.getResult() != 'SUCCESS') {
             project = stage_2_result.getProjectName()
             build = stage_2_result.getNumber()