Changeset 80a9898

Timestamp:

Jan 28, 2019, 3:34:13 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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.

Message:

Merge branch 'jenkins-sandbox'

Files:

• Jenkinsfile (modified) (8 diffs)
• benchmark/jenkins.sh (added)
• tools/PrettyGitLogs.sh (modified) (1 diff)

Jenkinsfile ¶

@@ -7 +7 @@
 node('master') {
         // Globals
-        BuildDir  = null
-        SrcDir    = null
+        BuildDir  = pwd tmp: true
+        SrcDir    = pwd tmp: false
         Settings  = null
         StageName = ''
@@ -46 +46 @@
                                 publish()
                         }
+
+                        // Update the build directories when exiting the node
+                        BuildDir  = pwd tmp: true
+                        SrcDir    = pwd tmp: false
 
                         notify_server(45)
@@ -149 +153 @@
                 dir (BuildDir) {
                         //Append bench results
-                        sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
+                        sh "${SrcDir}/jenkins.sh ${GitNewRef} ${Architecture} ${BuildDir}/bench.json"
                 }
         }
@@ -175 +179 @@
 
                 //Then publish the results
-                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
+                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @${BuildDir}/bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
         }
 }
@@ -185 +189 @@
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
-        sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
+        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
 
         def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
@@ -298 +302 @@
                 switch( param.Architecture ) {
                         case 'x64':
-                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
+                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
                         break
                         case 'x86':
-                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
+                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
                         break
                         default :
@@ -377 +381 @@
                 ]])
 
+        // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
+        checkout scm
+
         final settings = new BuildSettings(params, env.BRANCH_NAME)
 
@@ -404 +411 @@
         catch (Exception caughtError) {
                 err = caughtError //rethrow error later
-                sh 'cat *.log'
+                sh 'cat build/*.log'
         }
         finally {

tools/PrettyGitLogs.sh ¶

@@ -3 +3 @@
 set -e
 
-GIT_UPDATE="$1/GIT_UPDATE"
-GIT_LOG="$1/GIT_LOG"
-GIT_DIFF="$1/GIT_DIFF"
+GIT="git --git-dir=$1/.git"
+
+GIT_UPDATE="$2/GIT_UPDATE"
+GIT_LOG="$2/GIT_LOG"
+GIT_DIFF="$2/GIT_DIFF"
 
 rm -f ${GIT_UPDATE}  ${GIT_LOG}  ${GIT_DIFF}
 
-GitOldRef=$2
-GitNewRef=$3
+GitOldRef=$3
+GitNewRef=$4