Revert "Update stage1 and stage3 to run robot tests with tag"

[osm/devops.git] / jenkins / ci-pipelines / ci_stage_1.groovy

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index 261e12f..0f530c5 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -59,6 +59,12 @@ node("${params.NODE}") {
             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 = [
@@ -69,16 +75,10 @@ node("${params.NODE}") {
             string(name: 'PROJECT_URL_PREFIX', value: params.PROJECT_URL_PREFIX),
             string(name: 'DOCKER_TAG', value: params.DOCKER_TAG),
             booleanParam(name: 'TEST_INSTALL', value: params.TEST_INSTALL),
+            booleanParam(name: 'DO_ROBOT', value: params.DO_ROBOT),
+            booleanParam(name: 'DO_STAGE_4', value: do_stage_4),
         ]
-        if ( params.DO_ROBOT )
-        {
-            downstream_params.add(booleanParam(name: 'DO_ROBOT', value: params.DO_ROBOT))
-        }
-        if ( params.ROBOT_TAG )
-        {
-            downstream_params.add(booleanParam(name: 'ROBOT_TAG', value: params.ROBOT_TAG))
-        }
-
+     
         if ( params.STAGE )
         {
             // go directly to stage 3 (osm system)
@@ -101,8 +101,8 @@ node("${params.NODE}") {
                 project = stage_3_merge_result.getProjectName()
                 build = stage_3_merge_result.getNumber()
                 // Jayant if the build fails the below error will cause the pipeline to terminate. 
-                // error("${project} build ${build} failed")
-                currentBuild.result = stage_3_merge_result.getResult()
+                           // error("${project} build ${build} failed")
+                               currentBuild.result = stage_3_merge_result.getResult()
             }
        }
         catch(caughtError) {
@@ -111,7 +111,7 @@ node("${params.NODE}") {
         }
         finally {
             try {
-                if ((currentBuild.result != 'SUCCESS') && (env.JOB_NAME.startsWith('daily-stage_4'))){
+                if((currentBuild.result != 'SUCCESS') && (env.JOB_NAME == 'daily-stage_4')){
                     emailext (
                         subject: "[OSM-Jenkins] Job: ${env.JOB_NAME} Build: ${env.BUILD_NUMBER} Result: ${currentBuild.result}",
                         body: """ Check console output at "${env.BUILD_URL}"  """,