Changeset 8d63649

Timestamp:

Apr 29, 2019, 11:16:41 AM (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:

b7b573c

Parents:

cbef27b

Message:

Jenkins has to unconditionnaly plot otherwise the plot get URLs get invalidated

File:

• Jenkinsfile (modified) (4 diffs)

Jenkinsfile

@@ -170 +170 @@
         build_stage('Publish') {
 
-                if( !Settings.Publish ) return
-                if( !Settings.RunBenchmark ) {
-                        echo 'No results to publish!!!'
-                        return
-                }
+                if( !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
 
                 def groupCompile = new PlotGroup('Compilation', 'seconds', true)
@@ -180 +176 @@
 
                 //Then publish the results
-                do_plot('compile'  , groupCompile    , 'Compilation')
-                do_plot('ctxswitch', groupConcurrency, 'Context Switching')
-                do_plot('mutex'    , groupConcurrency, 'Mutual Exclusion')
-                do_plot('signal'   , groupConcurrency, 'Internal and External Scheduling')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'  , groupCompile    , 'Compilation')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch', groupConcurrency, 'Context Switching')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'    , groupConcurrency, 'Mutual Exclusion')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'   , groupConcurrency, 'Internal and External Scheduling')
         }
 }
@@ -437 +433 @@
 }
 
-def do_plot(String file, PlotGroup group, String title) {
-        echo "file is ${BuildDir}/benchmark/${file}.csv, group ${group}, title ${title}"
-        dir("${BuildDir}/benchmark/") {
-                plot csvFileName: "cforall-${env.BRANCH_NAME}-${file}.csv",
-                        csvSeries: [[
+def do_plot(boolean silent, String file, PlotGroup group, String title) {
+
+        def series = silent ? [] : [[
                                 file: "${file}.csv",
                                 exclusionValues: '',
@@ -447 +441 @@
                                 inclusionFlag: 'OFF',
                                 url: ''
-                        ]],
+                        ]];
+
+        echo "file is ${BuildDir}/benchmark/${file}.csv, group ${group}, title ${title}"
+        dir("${BuildDir}/benchmark/") {
+                plot csvFileName: "cforall-${env.BRANCH_NAME}-${file}.csv",
+                        csvSeries: series,
                         group: "${group.name}",
                         title: "${title}",