Changeset a2a0065 for Jenkinsfile

Timestamp:

Apr 23, 2019, 12:31:26 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

ce2e547

Parents:

d9f2874

Message:

Removed no longer needed server notification and tentative fix for plotting

File:

• Jenkinsfile (modified) (6 diffs)

Jenkinsfile

@@ -22 +22 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        notify_server(0)
-
                         Settings = prepare_build()
 
@@ -34 +32 @@
                                 checkout()
 
-                                notify_server(0)
-
                                 build()
 
@@ -50 +46 @@
                         BuildDir  = pwd tmp: true
                         SrcDir    = pwd tmp: false
-
-                        notify_server(45)
                 }
         }
@@ -183 +177 @@
 
                 //Then publish the results
-                plot csvFileName: "cforall-${env.BRANCH_NAME}-compilation.csv",
-                        csvSeries: [[file: "${BuildDir}/benchmark/compile.csv"]],
-                        group: 'Compilation',
-                        title: 'Compilation',
-                        style: 'line'
-
-                plot csvFileName: 'cforall-${env.BRANCH_NAME}-ctxswitch.csv',
-                        csvSeries: [[file: "${BuildDir}/benchmark/ctxswitch.csv"]],
-                        group: 'Concurrency',
-                        title: 'Context Switching',
-                        style: 'line'
-
-                plot csvFileName: 'cforall-${env.BRANCH_NAME}-mutex.csv',
-                        csvSeries: [[file: "${BuildDir}/benchmark/mutex.csv"]],
-                        group: 'Concurrency',
-                        title: 'Mutual Exclusion',
-                        style: 'line'
-
-                plot csvFileName: 'cforall-${env.BRANCH_NAME}-signal.csv',
-                        csvSeries: [[file: "${BuildDir}/benchmark/signal.csv"]],
-                        group: 'Concurrency',
-                        title: 'Internal and External Scheduling',
-                        style: 'line'
+                do_plot('compile', 'Compilation', 'Compilation')
+
+                do_plot('ctxswitch', 'Concurrency', 'Context Switching')
+
+                do_plot('mutex', 'Concurrency', 'Mutual Exclusion')
+
+                do_plot('signal', 'Concurrency', 'Internal and External Scheduling')
         }
 }
@@ -424 +402 @@
 }
 
-def notify_server(int wait) {
-        sh """curl --silent --show-error --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
-        return
-}
-
 def make_doc() {
         def err = null
@@ -443 +416 @@
         }
 }
+
+def do_plot(String file, String group, String title) {
+        plot csvFileName: "cforall-${env.BRANCH_NAME}-${file}.csv",
+                csvSeries: [[
+                        file: "${BuildDir}/benchmark/${file}.csv",
+                        exclusionValues: '',
+                        displayTableFlag: false,
+                        inclusionFlag: 'OFF',
+                        url: ''
+                ]],
+                group: "${group}",
+                title: "${title}",
+                style: 'line',
+                exclZero: false,
+                keepRecords: false,
+                logarithmic: false,
+                numBuilds: '',
+                useDescr: false,
+                yaxis: '',
+                yaxisMaximum: '',
+                yaxisMinimum: ''
+}