Changes in / [a3e7d34:e24f13a]

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -1 +1 @@
 
-def build() {
-        build_stage 'Checkout'
-
-                //checkout the source code and clean the repo
-                sh 'rm -rf *'
-                checkout scm
-
-        build_stage 'Build'
-
-                //Configure the conpilation (Output is not relevant)
-                //Use the current directory as the installation target so nothing
-                //escapes the sandbox
-                //Also specify the compiler by hand
-                def install_dir = pwd tmp: true
-                sh "CC=gcc-4.9 CXX=g++-4.9 ./configure --prefix=${install_dir} > /dev/null"
-
-                //Compile the project
-                sh 'make -j 8 install'
-
-        build_stage 'Test'
-
-                status_prefix = 'Test'
-
-                dir ('src/examples') {
-                        sh './runTests.sh'
-                }
-
-        build_stage 'Cleanup'
-
-                //install doesn't need to be cleaned since prefix uses temporary workspace
-}
-
-def Compiler
-
-def build_stage(String name) {
-        def stage_name = "${Compiler} ${name}"
-        stage stage_name
-
-                status_prefix = stage_name
-}
 
 node ('master'){
 
         def err = null
-        def status_prefix
+        def stage_name
         def log_needed = false
         currentBuild.result = "SUCCESS"
 
         try {
-                Compiler = 'gcc-4.9'
-                build()
 
+                stage 'Checkout'
+
+                        //checkout the source code and clean the repo
+                        checkout scm
+                        sh 'git clean -dfq'
+
+                stage 'Build'
+
+                        stage_name = 'Build'
+
+                        //Clean the directory (Output is not relevant)
+                        sh 'make clean > /dev/null'
+
+                        //Configure the conpilation (Output is not relevant)
+                        //Use the current directory as the installation target so nothing
+                        //escapes the sandbox
+                        //Also specify the compiler by hand
+                        def install_dir = pwd tmp: true
+                        sh "CC=gcc-4.9 CXX=g++-4.9 ./configure --prefix=${install_dir} > /dev/null"
+
+                        //Compile the project
+                        sh 'make -j 8 install'
+
+                stage 'Test'
+
+                        stage_name = 'Test'
+
+                        dir ('src/examples') {
+                                sh './runTests.sh'
+                        }
+
+                stage 'Cleanup'
+
+                        //install doesn't need to be cleaned since prefix uses temporary workspace
         }
 
@@ -57 +49 @@
                 err = caughtError
                 log_needed = true
-                currentBuild.result = "${status_prefix} FAILURE"
+                currentBuild.result = "FAILURE"
+
+                switch(stage_name) {
+                        case 'Test' :
+                                currentBuild.result = "TEST FAILURE"
+                                break
+                        default :
+                                break
+                }
         }
 
@@ -76 +76 @@
         def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
 
-        def email_subject = "[${project_name} git][BUILD - ${status}!]Build # ${env.BUILD_NUMBER} - ${env.BRANCH_NAME}"
-        def email_body = """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 was pushed to the repository containing
-the project "UNNAMED PROJECT".
+        def email_subject = "[${project_name} git] UNNAMED PROJECT branch ${env.BRANCH_NAME} - Build # ${env.BUILD_NUMBER} - ${status}!"
+        def email_body = """    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 was pushed to the repository containing
+        the project "UNNAMED PROJECT".
 
-The branch ${env.BRANCH_NAME} has been updated.
+        The branch ${env.BRANCH_NAME} has been updated.
 
-Check console output at ${env.BUILD_URL} to view the results."""
+        Check console output at ${env.BUILD_URL} to view the results."""
 
         // def config = new File('/u/cforall/software/cfa/cfa-cc/config').text