Changes in Jenkinsfile [bd50205:cc9ec56]

File:

• Jenkinsfile (modified) (2 diffs)

Jenkinsfile

@@ -7 +7 @@
 //===========================================================================================================
 
-// Globals
-BuildDir  = null
-SrcDir    = null
-Settings  = null
-Tools     = null
-
-// Local variables
-def err = null
-def log_needed = false
-
-currentBuild.result = "SUCCESS"
-
-try {
-        node {
+node('master') {
+        // Globals
+        BuildDir  = pwd tmp: true
+        SrcDir    = pwd tmp: false
+        Settings  = null
+        Tools     = null
+
+        // Local variables
+        def err = null
+        def log_needed = false
+
+        currentBuild.result = "SUCCESS"
+
+        try {
                 //Wrap build to add timestamp to command line
                 wrap([$class: 'TimestamperBuildWrapper']) {
+
                         Settings = prepare_build()
-                }
-        }
-
-        node(Settings.Architecture.node) {
-                //Wrap build to add timestamp to command line
-                wrap([$class: 'TimestamperBuildWrapper']) {
+
+                        node(Settings.Architecture.node) {
+                                BuildDir  = pwd tmp: true
+                                SrcDir    = pwd tmp: false
+                                currentBuild.description = "${currentBuild.description} on ${env.NODE_NAME}"
+
+                                Tools.Clean()
+
+                                Tools.Checkout()
+
+                                build()
+
+                                test()
+
+                                benchmark()
+
+                                build_doc()
+
+                                publish()
+                        }
+
+                        // Update the build directories when exiting the node
                         BuildDir  = pwd tmp: true
                         SrcDir    = pwd tmp: false
-                        currentBuild.description = "${currentBuild.description} on ${env.NODE_NAME}"
-
-                        Tools.Clean()
-
-                        Tools.Checkout()
-
-                        build()
-
-                        test()
-
-                        benchmark()
-
-                        build_doc()
-
-                        publish()
-                }
-        }
-}
-
-//If an exception is caught we need to change the status and remember to
-//attach the build log to the email
-catch (Exception caughtError) {
-        // Store the result of the build log
-        currentBuild.result = "FAILURE"
-
-        // An error has occured, the build log is relevent
-        log_needed = true
-
-        // rethrow error later
-        err = caughtError
-
-        // print the error so it shows in the log
-        echo err.toString()
-}
-
-finally {
-        //Send email with final results if this is not a full build
-        email(log_needed)
-
-        echo 'Build Completed'
-
-        /* Must re-throw exception to propagate error */
-        if (err) {
-                throw err
+                }
+        }
+
+        //If an exception is caught we need to change the status and remember to
+        //attach the build log to the email
+        catch (Exception caughtError) {
+                // Store the result of the build log
+                currentBuild.result = "FAILURE"
+
+                // An error has occured, the build log is relevent
+                log_needed = true
+
+                // rethrow error later
+                err = caughtError
+
+                // print the error so it shows in the log
+                echo err.toString()
+        }
+
+        finally {
+                //Send email with final results if this is not a full build
+                email(log_needed)
+
+                echo 'Build Completed'
+
+                /* Must re-throw exception to propagate error */
+                if (err) {
+                        throw err
+                }
         }
 }
@@ -226 +228 @@
 //Standard build email notification
 def email(boolean log) {
-        node {
-                //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
-                //Configurations for email format
-                echo 'Notifying users of result'
-
-                def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
-                def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
-                def email_body = """<p>This is an automated email from the Jenkins build machine. It was
-        generated because of a git hooks/post-receive script following
-        a ref change which was pushed to the C\u2200 repository.</p>
-        """ + Tools.GitLogMessage()
-
-                def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
-
-                if( Settings && !Settings.Silent ) {
-                        //send email notification
-                        emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
-                } else {
-                        echo "Would send email to: ${email_to}"
-                        echo "With title: ${email_subject}"
-                        echo "Content: \n${email_body}"
-                }
+        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
+        //Configurations for email format
+        echo 'Notifying users of result'
+
+        def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
+        def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
+        def email_body = """<p>This is an automated email from the Jenkins build machine. It was
+generated because of a git hooks/post-receive script following
+a ref change which was pushed to the C\u2200 repository.</p>
+""" + Tools.GitLogMessage()
+
+        def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
+
+        if( Settings && !Settings.Silent ) {
+                //send email notification
+                emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
+        } else {
+                echo "Would send email to: ${email_to}"
+                echo "With title: ${email_subject}"
+                echo "Content: \n${email_body}"
         }
 }