X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_1.groovy;h=8bc6ac58ff11d12daf9f42d511e7d550e4f6d679;hb=4a7a23cdf44402d3be70b491049129b0b28ed02f;hp=d3c4fa1b0b5dfc8cc77d693ea984a471c1112730;hpb=c67a2378b3eb4fa1a42149b7118becf5cb0e1ffc;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index d3c4fa1b..8bc6ac58 100644
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -14,7 +14,11 @@
  *   License for the specific language governing permissions and limitations
  *   under the License.
  */
-
+/* Change log:
+ * 1. Bug 699 : Jayant Madavi, Mrityunjay Yadav : JM00553988@techmahindra.com : 23-july-2019 : Improvement to the code, now using post syntax
+ * 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 = ''
 def Get_MDG(project) {
     // split the project.
@@ -55,12 +59,6 @@ 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,10 +67,18 @@ 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_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_NAME )
+        {
+            downstream_params.add(string(name: 'ROBOT_TAG_NAME', value: params.ROBOT_TAG_NAME))
+        }
+
         if ( params.STAGE )
         {
             // go directly to stage 3 (osm system)
@@ -83,28 +89,43 @@ node("${params.NODE}") {
                 println("disabling stage_3 invocation")
                 return
             }
+            // in this case, since this is for daily jobs, the pass threshold for robot tests should be adapted
+            downstream_params.add(string(name: 'ROBOT_PASS_THRESHOLD', value: '99.0'))
         }
         // callout to stage_2.  This is a multi-branch pipeline.
         downstream_job_name = "${mdg}-${stage_name}/${GERRIT_BRANCH}"
 
         println("TEST_INSTALL = ${params.TEST_INSTALL}, downstream job: ${downstream_job_name}")
-
-        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 = 'SUCCESS'
+        try {
+            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'
         }
-    }
-	stage('Send Email') {
-        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()]
-            )
+        finally {
+            try {
+                if ((currentBuild.result != 'SUCCESS') && (env.JOB_NAME.startsWith('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"
+            }
         }
     }
 }
+