X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_1.groovy;h=d74de59107c071299fb376b76dcccaf3279e7a09;hb=ae8b04e946f0e8028eaf49b87858582c46487004;hp=117265aebaa8d7c7d017d30d06f033809023b3f1;hpb=e609a968bf8054d76196781a4bd80e679c6184dc;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index 117265ae..d74de591 100644
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -36,18 +36,24 @@ node("${params.NODE}") {
     }
 
     stage('downstream') {
-        // initially use stage_name as the event_type
-        def stage_name = GERRIT_EVENT_TYPE
+        // default to stage_2 (patchset)
+        def stage_name = "stage_2"
 
-        switch(GERRIT_EVENT_TYPE) {
-            case "change-merged":
-               stage_name = "stage_2-merge"
-               break
+        try {
+            switch(GERRIT_EVENT_TYPE) {
+                case "change-merged":
+                   stage_name = "stage_2-merge"
+                   break
 
-            case "patchset-created":
-               stage_name = "stage_2"
-               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)
         {
@@ -69,7 +75,7 @@ node("${params.NODE}") {
         if ( params.STAGE )
         {
             // go directly to stage 3 (osm system)
-            stage_name = "stage_3"
+            stage_name = params.STAGE
             mdg = "osm"
             if ( ! params.TEST_INSTALL )
             {