Changes in / [80a9898:4fd45bc]


Ignore:
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r80a9898 r4fd45bc  
    77node('master') {
    88        // Globals
    9         BuildDir  = pwd tmp: true
    10         SrcDir    = pwd tmp: false
     9        BuildDir  = null
     10        SrcDir    = null
    1111        Settings  = null
    1212        StageName = ''
     
    4646                                publish()
    4747                        }
    48 
    49                         // Update the build directories when exiting the node
    50                         BuildDir  = pwd tmp: true
    51                         SrcDir    = pwd tmp: false
    5248
    5349                        notify_server(45)
     
    153149                dir (BuildDir) {
    154150                        //Append bench results
    155                         sh "${SrcDir}/jenkins.sh ${GitNewRef} ${Architecture} ${BuildDir}/bench.json"
     151                        sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
    156152                }
    157153        }
     
    179175
    180176                //Then publish the results
    181                 sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @${BuildDir}/bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
     177                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
    182178        }
    183179}
     
    189185        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
    190186
    191         sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
     187        sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
    192188
    193189        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
     
    302298                switch( param.Architecture ) {
    303299                        case 'x64':
    304                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
     300                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
    305301                        break
    306302                        case 'x86':
    307                                 this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
     303                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
    308304                        break
    309305                        default :
     
    381377                ]])
    382378
    383         // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
    384         checkout scm
    385 
    386379        final settings = new BuildSettings(params, env.BRANCH_NAME)
    387380
     
    411404        catch (Exception caughtError) {
    412405                err = caughtError //rethrow error later
    413                 sh 'cat build/*.log'
     406                sh 'cat *.log'
    414407        }
    415408        finally {
  • tools/PrettyGitLogs.sh

    r80a9898 r4fd45bc  
    33set -e
    44
    5 GIT="git --git-dir=$1/.git"
    6 
    7 GIT_UPDATE="$2/GIT_UPDATE"
    8 GIT_LOG="$2/GIT_LOG"
    9 GIT_DIFF="$2/GIT_DIFF"
     5GIT_UPDATE="$1/GIT_UPDATE"
     6GIT_LOG="$1/GIT_LOG"
     7GIT_DIFF="$1/GIT_DIFF"
    108
    119rm -f ${GIT_UPDATE}  ${GIT_LOG}  ${GIT_DIFF}
    1210
    13 GitOldRef=$3
    14 GitNewRef=$4
     11GitOldRef=$2
     12GitNewRef=$3
    1513
    1614
Note: See TracChangeset for help on using the changeset viewer.