X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_1.groovy;h=0f530c5269f35ade9685fda49f145692005e3450;hb=b3ac0c2eb3a011766030c83929f1b859f2d1e24b;hp=ea221cf69050d934c40bdc4acc317acf8b161126;hpb=852a07d1b4a177726be0de5a364fc066839359b8;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index ea221cf6..0f530c52 100644
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -16,7 +16,7 @@
  */
 /* Change log:
  * 1. Bug 699 : Jayant Madavi, Mrityunjay Yadav : JM00553988@techmahindra.com : 23-july-2019 : Improvement to the code, now using post syntax
- * 2.
+ * 2. Jayant Madavi : 26-july-2019 : optimization to the previous check-in added currentBuild.result = 'SUCCESS'. TODO: code would be better *    if we use pipeline declarative 
  */
  
 stage_3_merge_result = ''
@@ -73,7 +73,9 @@ node("${params.NODE}") {
             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),
+            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),
         ]
      
@@ -92,36 +94,36 @@ node("${params.NODE}") {
         downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
 
         println("TEST_INSTALL = ${params.TEST_INSTALL}, downstream job: ${downstream_job_name}")
+		currentBuild.result = 'SUCCESS'
         try {
-           stage_3_merge_result = build job: "${downstream_job_name}", parameters: downstream_params, propagate: true
+            stage_3_merge_result = build job: "${downstream_job_name}", parameters: downstream_params, propagate: true
             if (stage_3_merge_result.getResult() != 'SUCCESS') {
                 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()
             }
-		} 
-		catch(caughtError) {
-		 echo 'Exception in stage_1'
-		 currentBuild.result = 'FAILURE'
-		}
-		finally {
-		    try {
-			 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}"  """,
-                   to: 'OSM_MDL@list.etsi.org',
-                   recipientProviders: [culprits()]
-                )
+	}
+        catch(caughtError) {
+            echo 'Exception in stage_1'
+            currentBuild.result = 'FAILURE'
+        }
+        finally {
+            try {
+                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}"  """,
+                        to: 'OSM_MDL@list.etsi.org',
+                        recipientProviders: [culprits()]
+                    )
+                }
             }
-		  }
-		  catch(caughtError) {
-		    echo "Failure in executing email"
-		  }
-
-		}
-    } 
+            catch(caughtError) {
+                echo "Failure in executing email"
+            }
+        }
+    }
+}
 
-	
- }