Changeset 298581c for Jenkinsfile

Timestamp:

May 9, 2017, 1:56:38 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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:

6182039

Parents:

c10ee66 (diff), f408e1a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (11 diffs)

Jenkinsfile

@@ -28 +28 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        //Prevent the build from exceeding 60 minutes
-                        timeout(60) {
-
-                                notify_server()
-
-                                prepare_build()
-
-                                checkout()
-
-                                build()
-
-                                test()
-
-                                benchmark()
-
-                                clean()
-
-                                build_doc()
-
-                                publish()
-
-                                notify_server()
-                        }
+                        notify_server()
+
+                        prepare_build()
+
+                        checkout()
+
+                        build()
+
+                        test()
+
+                        benchmark()
+
+                        clean()
+
+                        build_doc()
+
+                        publish()
+
+                        notify_server()
                 }
         }
@@ -89 +85 @@
 def collect_git_info() {
 
+        checkout scm
+
         //create the temporary output directory in case it doesn't already exist
         def out_dir = pwd tmp: true
@@ -95 +93 @@
         //parse git logs to find what changed
         gitRefName = env.BRANCH_NAME
-        dir("../${gitRefName}@script") {
-                sh "git reflog > ${out_dir}/GIT_COMMIT"
-        }
+        sh "git reflog > ${out_dir}/GIT_COMMIT"
         git_reflog = readFile("${out_dir}/GIT_COMMIT")
         gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
@@ -170 +166 @@
 }
 
-def build_stage(String name) {
+def build_stage(String name, Closure block ) {
         stage_name = name
-        stage name
+        stage(name, block)
 }
 
@@ -245 +241 @@
 //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
@@ -254 +250 @@
                 //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
@@ -269 +266 @@
                 //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
@@ -282 +280 @@
                         sh 'make -C src/tests'
                 }
+        }
 }
 
 def benchmark() {
-        build_stage'Benchmark'
+        build_stage('Benchmark') {
 
                 if( !do_benchmark ) return
@@ -294 +293 @@
                 //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
@@ -315 +316 @@
                         make_doc()
                 }
+        }
 }
 
 def publish() {
-        build_stage'Publish'
+        build_stage('Publish') {
 
                 if( !do_publish ) return
@@ -324 +326 @@
                 //Then publish the results
                 sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null || true'
+        }
 }