Changes in Jenkinsfile [0961bf4:3831b58]

File:

• Jenkinsfile (modified) (11 diffs)

Jenkinsfile

@@ -28 +28 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        notify_server()
-
-                        prepare_build()
-
-                        checkout()
-
-                        build()
-
-                        test()
-
-                        benchmark()
-
-                        clean()
-
-                        build_doc()
-
-                        publish()
-
-                        notify_server()
+                        //Prevent the build from exceeding 60 minutes
+                        timeout(60) {
+
+                                notify_server()
+
+                                prepare_build()
+
+                                checkout()
+
+                                build()
+
+                                test()
+
+                                benchmark()
+
+                                clean()
+
+                                build_doc()
+
+                                publish()
+
+                                notify_server()
+                        }
                 }
         }
@@ -85 +89 @@
 def collect_git_info() {
 
-        checkout scm
-
         //create the temporary output directory in case it doesn't already exist
         def out_dir = pwd tmp: true
@@ -93 +95 @@
         //parse git logs to find what changed
         gitRefName = env.BRANCH_NAME
-        sh "git reflog > ${out_dir}/GIT_COMMIT"
+        dir("../${gitRefName}@script") {
+                sh "git reflog > ${out_dir}/GIT_COMMIT"
+        }
         git_reflog = readFile("${out_dir}/GIT_COMMIT")
         gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
@@ -166 +170 @@
 }
 
-def build_stage(String name, Closure block ) {
+def build_stage(String name) {
         stage_name = name
-        stage(name, block)
+        stage name
 }
 
@@ -241 +245 @@
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
-        build_stage('Checkout') {
+        build_stage'Checkout'
                 //checkout the source code and clean the repo
                 checkout scm
@@ -250 +254 @@
                 //Reset the git repo so no local changes persist
                 sh 'git reset --hard'
-        }
 }
 
 def build() {
-        build_stage('Build') {
+        build_stage'Build'
         
                 def install_dir = pwd tmp: true
@@ -266 +269 @@
                 //Compile the project
                 sh 'make -j 8 --no-print-directory V=0 install'
-        }
 }
 
 def test() {
-        build_stage('Test') {
+        build_stage'Test'
 
                 //Run the tests from the tests directory
                 if ( do_alltests ) {
-                        sh 'make -C src/tests all-tests debug=yes --no-print-directory'
-                        sh 'make -C src/tests all-tests debug=no --no-print-directory'
+                        sh 'make -C src/tests all-tests debug=yes'
+                        sh 'make -C src/tests all-tests debug=no'
                 }
                 else {
-                        sh 'make -C src/tests --no-print-directory'
-                }
-        }
+                        sh 'make -C src/tests'
+                }
 }
 
 def benchmark() {
-        build_stage('Benchmark') {
+        build_stage'Benchmark'
 
                 if( !do_benchmark ) return
@@ -293 +294 @@
                 //Append bench results
                 sh 'make -C src/benchmark --no-print-directory csv-data >> bench.csv'
-        }
 }
 
 def clean() {
-        build_stage('Cleanup') {
+        build_stage'Cleanup'
 
                 //do a maintainer-clean to make sure we need to remake from scratch
                 sh 'make maintainer-clean > /dev/null'
-        }
 }
 
 def build_doc() {
-        build_stage('Documentation') {
+        build_stage'Documentation'
 
                 if( !do_doc ) return
@@ -316 +315 @@
                         make_doc()
                 }
-        }
 }
 
 def publish() {
-        build_stage('Publish') {
+        build_stage'Publish'
 
                 if( !do_publish ) return
@@ -326 +324 @@
                 //Then publish the results
                 sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null || true'
-        }
 }
 
@@ -374 +371 @@
 """
 
-        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com, ajbeach@edu.uwaterloo.ca"
+        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com"
 
         //send email notification