Changeset b7f8cb4 for Jenkinsfile

Timestamp:

Nov 16, 2017, 12:26:09 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

0cf5b79, 0fe4e62, 5f91d650

Parents:

11094d9 (diff), c3d048c (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) (5 diffs)

Jenkinsfile

@@ -15 +15 @@
         arch_name               = ''
         architecture    = ''
-        
+
         do_alltests             = false
         do_benchmark    = false
@@ -183 +183 @@
                 sh 'make clean > /dev/null'
                 sh 'make > /dev/null 2>&1'
-        } 
+        }
         catch (Exception caughtError) {
                 err = caughtError //rethrow error later
@@ -257 +257 @@
 def build() {
         build_stage('Build') {
-        
+
                 def install_dir = pwd tmp: true
-                
+
                 //Configure the conpilation (Output is not relevant)
                 //Use the current directory as the installation target so nothing
@@ -290 +290 @@
                 if( !do_benchmark ) return
 
-                //Write the commit id to Benchmark
-                writeFile  file: 'bench.csv', text:'data=' + gitRefNewValue + ',' + arch_name + ','
- 
                 //Append bench results
-                sh 'make -C src/benchmark --no-print-directory csv-data >> bench.csv'
+                sh 'make -C src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
         }
 }
@@ -327 +324 @@
 
                 //Then publish the results
-                sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null || true'
+                sh 'curl -H "Content-Type: application/json" --silent --data @bench.json http://plg2:8082/jenkins/publish > /dev/null || true'
         }
 }