Changeset 80a9898


Ignore:
Timestamp:
Jan 28, 2019, 3:34:13 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
192d4a5
Parents:
4fd45bc (diff), 8f99233 (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 'jenkins-sandbox'

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r4fd45bc r80a9898  
    77node('master') {
    88        // Globals
    9         BuildDir  = null
    10         SrcDir    = null
     9        BuildDir  = pwd tmp: true
     10        SrcDir    = pwd tmp: false
    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
    4852
    4953                        notify_server(45)
     
    149153                dir (BuildDir) {
    150154                        //Append bench results
    151                         sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
     155                        sh "${SrcDir}/jenkins.sh ${GitNewRef} ${Architecture} ${BuildDir}/bench.json"
    152156                }
    153157        }
     
    175179
    176180                //Then publish the results
    177                 sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
     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'
    178182        }
    179183}
     
    185189        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
    186190
    187         sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
     191        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
    188192
    189193        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
     
    298302                switch( param.Architecture ) {
    299303                        case 'x64':
    300                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
     304                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
    301305                        break
    302306                        case 'x86':
    303                                 this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
     307                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
    304308                        break
    305309                        default :
     
    377381                ]])
    378382
     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
    379386        final settings = new BuildSettings(params, env.BRANCH_NAME)
    380387
     
    404411        catch (Exception caughtError) {
    405412                err = caughtError //rethrow error later
    406                 sh 'cat *.log'
     413                sh 'cat build/*.log'
    407414        }
    408415        finally {
  • tools/PrettyGitLogs.sh

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