Changeset b7f8cb4 for Jenkinsfile


Ignore:
Timestamp:
Nov 16, 2017, 12:26:09 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
0cf5b79, 0fe4e62, 5f91d65
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r11094d9 rb7f8cb4  
    1515        arch_name               = ''
    1616        architecture    = ''
    17        
     17
    1818        do_alltests             = false
    1919        do_benchmark    = false
     
    183183                sh 'make clean > /dev/null'
    184184                sh 'make > /dev/null 2>&1'
    185         } 
     185        }
    186186        catch (Exception caughtError) {
    187187                err = caughtError //rethrow error later
     
    257257def build() {
    258258        build_stage('Build') {
    259        
     259
    260260                def install_dir = pwd tmp: true
    261                
     261
    262262                //Configure the conpilation (Output is not relevant)
    263263                //Use the current directory as the installation target so nothing
     
    290290                if( !do_benchmark ) return
    291291
    292                 //Write the commit id to Benchmark
    293                 writeFile  file: 'bench.csv', text:'data=' + gitRefNewValue + ',' + arch_name + ','
    294  
    295292                //Append bench results
    296                 sh 'make -C src/benchmark --no-print-directory csv-data >> bench.csv'
     293                sh 'make -C src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
    297294        }
    298295}
     
    327324
    328325                //Then publish the results
    329                 sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null || true'
     326                sh 'curl -H "Content-Type: application/json" --silent --data @bench.json http://plg2:8082/jenkins/publish > /dev/null || true'
    330327        }
    331328}
Note: See TracChangeset for help on using the changeset viewer.