X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_1.groovy;h=53466f75c0b72c2bd22963ab32ffb70fb4b3a3b3;hb=f4fae40a27390b16c88ca991358c62278f1c4d47;hp=722f9c9a57f1785d11f081eca70ad667be6725be;hpb=dbe6cffce76d63abf34a0d9e47c6d5f015c513be;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index 722f9c9a..53466f75 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,6 +94,7 @@ 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
             if (stage_3_merge_result.getResult() != 'SUCCESS') {
@@ -99,14 +102,16 @@ node("${params.NODE}") {
                 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) {
+		}
+		catch(caughtError) {
 		 echo 'Exception in stage_1'
 		 currentBuild.result = 'FAILURE'
 		}
 		finally {
-			 if((${currentBuild.result} != 'SUCCESS') && (${env.JOB_NAME} == 'daily-stage_4')){
+		    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}"  """,
@@ -114,6 +119,10 @@ node("${params.NODE}") {
                    recipientProviders: [culprits()]
                 )
             }
+		  }
+		  catch(caughtError) {
+		    echo "Failure in executing email"
+		  }
 
 		}
     }