Changeset a3e1f8f

Timestamp:

Jul 12, 2016, 4:06:56 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8884112, b94206b

Parents:

ccd5b12

Message:

Fixed naming issues in Jenkinsfile

File:

• Jenkinsfile (modified) (5 diffs)

Jenkinsfile

@@ -134 +134 @@
 node ('master'){
 
-        boolean doFullBuild
+        boolean bIsFullBuild
         def err = null
         def log_needed = false
@@ -165 +165 @@
                                         ]])
 
-                                doFullBuild = isFullBuild == 'true'
+                                bIsFullBuild = isFullBuild == 'true'
                                 architectureFlag = buildArchitecture == '64-bit' ? '-m64' : (buildArchitecture == '32-bit' ? '-m32' : 'ERROR')
 
@@ -172 +172 @@
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-                                cfa_build(doFullBuild, architectureFlag)
+                                cfa_build(bIsFullBuild, architectureFlag)
 
                                 //Compile latex documentation
                                 doc_build()
 
-                                if( doFullBuild ) {
+                                if( bIsFullBuild ) {
                                         //Compile using gcc-5
                                         currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
@@ -204 +204 @@
 
         finally {
-                //Send email with final results
-                notify_result(doPromoteBuild2DoLang, err, currentBuild.result, log_needed)
+                //Send email with final results if this is not a full build
+                if( !bIsFullBuild ) {
+                        email(currentBuild.result, log_needed)
+                }
 
                 /* Must re-throw exception to propagate error */
@@ -217 +219 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
-def notify_result(boolean promote, Exception err, String status, boolean log) {
+def notify_result(boolean bIsFullBuild, Exception err, String status, boolean log) {
         echo 'Build completed, sending result notification'
-        if(promote)     {
-                if( err ) {
-                        promote_email(status)
-                }
-        }
-        else {
+        if(bIsFullBuild)         {
                 email(status, log)
         }