Changes in Jenkinsfile [8f99233:af43394]

File:

• Jenkinsfile (modified) (8 diffs)

Jenkinsfile

@@ -7 +7 @@
 node('master') {
         // Globals
-        BuildDir  = pwd tmp: true
-        SrcDir    = pwd tmp: false
+        BuildDir  = null
+        SrcDir    = null
         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)
@@ -153 +149 @@
                 dir (BuildDir) {
                         //Append bench results
-                        sh "${SrcDir}/jenkins.sh ${GitNewRef} ${Architecture} ${BuildDir}/bench.json"
+                        sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
                 }
         }
@@ -179 +175 @@
 
                 //Then publish the results
-                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @${BuildDir}/bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
+                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
         }
 }
@@ -189 +185 @@
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
-        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
+        sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
 
         def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
@@ -302 +298 @@
                 switch( param.Architecture ) {
                         case 'x64':
-                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
+                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
                         break
                         case 'x86':
-                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
+                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
                         break
                         default :
@@ -381 +377 @@
                 ]])
 
-        // 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)
 
@@ -411 +404 @@
         catch (Exception caughtError) {
                 err = caughtError //rethrow error later
-                sh 'cat build/*.log'
+                sh 'cat *.log'
         }
         finally {