Changeset 734891d

Timestamp:

Feb 22, 2017, 5:33:53 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

14ce3392, 9d169f1

Parents:

692de479

Message:

Fixed status prefix for email notification

File:

• Jenkinsfile (modified) (10 diffs)

Jenkinsfile

@@ -9 +9 @@
         def err = null
         def log_needed = false
+
+        stage_name              = ''
 
         compiler                = null
@@ -61 +63 @@
 
                 //Store the result of the build log
-                currentBuild.result = "${status_prefix} FAILURE".trim()
+                currentBuild.result = "${stage_name} FAILURE".trim()
         }
 
         finally {
-                echo 'Build Completed'
-
                 //Send email with final results if this is not a full build
-                if( !do_sendemail && !bIsSandbox ) {
+                if( (!do_sendemail) && (!bIsSandbox) ) {
                         echo 'Notifying users of result'
                         email(currentBuild.result, log_needed)
                 }
+
+                echo 'Build Completed'
 
                 /* Must re-throw exception to propagate error */
@@ -165 +167 @@
 }
 
+def build_stage(String name) {
+        stage_name = name
+        stage name
+}
+
 def notify_server() {
         sh 'curl --silent -X POST http://plg2:8082/jenkins/notify > /dev/null'
@@ -235 +242 @@
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
-        stage 'Checkout'
+        build_stage'Checkout'
                 //checkout the source code and clean the repo
                 checkout scm
@@ -247 +254 @@
 
 def build() {
-        stage 'Build'
+        build_stage'Build'
         
                 def install_dir = pwd tmp: true
@@ -262 +269 @@
 
 def test() {
-        stage 'Test'
+        build_stage'Test'
 
                 //Run the tests from the tests directory
@@ -275 +282 @@
 
 def benchmark() {
-        stage 'Benchmark'
+        build_stage'Benchmark'
 
                 if( !do_benchmark ) return
@@ -287 +294 @@
 
 def clean() {
-        stage 'Cleanup'
+        build_stage'Cleanup'
 
                 //do a maintainer-clean to make sure we need to remake from scratch
@@ -294 +301 @@
 
 def build_doc() {
-        stage 'Documentation'
+        build_stage'Documentation'
 
                 if( !do_doc ) return
@@ -308 +315 @@
 
 def publish() {
-        stage 'Publish'
+        build_stage'Publish'
 
                 if( !do_publish ) return