Changeset 80a9898 for Jenkinsfile
- Timestamp:
- Jan 28, 2019, 3:34:13 PM (6 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Jenkinsfile
r4fd45bc r80a9898 7 7 node('master') { 8 8 // Globals 9 BuildDir = null10 SrcDir = null9 BuildDir = pwd tmp: true 10 SrcDir = pwd tmp: false 11 11 Settings = null 12 12 StageName = '' … … 46 46 publish() 47 47 } 48 49 // Update the build directories when exiting the node 50 BuildDir = pwd tmp: true 51 SrcDir = pwd tmp: false 48 52 49 53 notify_server(45) … … 149 153 dir (BuildDir) { 150 154 //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" 152 156 } 153 157 } … … 175 179 176 180 //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' 178 182 } 179 183 } … … 185 189 if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n" 186 190 187 sh "${SrcDir}/tools/PrettyGitLogs.sh ${ BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"191 sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}" 188 192 189 193 def gitUpdate = readFile("${BuildDir}/GIT_UPDATE") … … 298 302 switch( param.Architecture ) { 299 303 case 'x64': 300 this.Architecture = new Arch_Desc('x64', '--host=x86_64', ' master')304 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64') 301 305 break 302 306 case 'x86': 303 this.Architecture = new Arch_Desc('x86', '--host=i386', ' master')307 this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86') 304 308 break 305 309 default : … … 377 381 ]]) 378 382 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 379 386 final settings = new BuildSettings(params, env.BRANCH_NAME) 380 387 … … 404 411 catch (Exception caughtError) { 405 412 err = caughtError //rethrow error later 406 sh 'cat *.log'413 sh 'cat build/*.log' 407 414 } 408 415 finally {
Note: See TracChangeset
for help on using the changeset viewer.