Revert "bug 542 files added/modified should contain license"

[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 4e7500d..d3c4fa1 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -15,7 +15,7 @@
  *   under the License.
  */
 
-stage_merge_result = ''
+stage_3_merge_result = ''
 def Get_MDG(project) {
     // split the project.
     def values = project.split('/')
@@ -88,24 +88,23 @@ node("${params.NODE}") {
         downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
 
         println("TEST_INSTALL = ${params.TEST_INSTALL}, downstream job: ${downstream_job_name}")
-        
 
-        stage_merge_result = build job: "${downstream_job_name}", parameters: downstream_params, propagate: true
-        if (stage_merge_result.getResult() != 'SUCCESS') {
-            project = stage_merge_result.getProjectName()
-            build = stage_merge_result.getNumber()
-            error("${project} build ${build} failed")
+        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")
         }
     }
-       // Mrityunjay: TODO check if the message can be put as html, what more variables can be used.
        stage('Send Email') {
-         if ((${env.JOB_NAME} == 'daily-stage_4')&& (stage_merge_result.getResult() != 'SUCCESS') {
-        emailext (
-           subject: "[OSM-Jenkins] Job: ${env.JOB_NAME} Build: ${env.BUILD_NUMBER} Result: ${stage_merge_result.getResult()}",
-           body: """ Check console output at "${env.BUILD_URL}"  """,
-           to: 'OSM_MDL@list.etsi.org',
-                  recipientProviders: [culprits()]
-        )
-         }
+        if((stage_3_merge_result.getResult() != 'SUCCESS') && (${env.JOB_NAME} == 'daily-stage_4')){
+            emailext (
+                subject: "[OSM-Jenkins] Job: ${env.JOB_NAME} Build: ${env.BUILD_NUMBER} Result: ${stage_3_merge_result.getResult()}",
+                body: """ Check console output at "${env.BUILD_URL}"  """,
+                to: 'OSM_MDL@list.etsi.org',
+                recipientProviders: [culprits()]
+            )
+        }
     }
 }