Merge "Adding the root pom to the distribution verification"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0892af895ccc92535b54e0aec72980e2f9534b6f..f1d8363f8760709c00c38e34f40bc0dc88bbafc0 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -174,6 +174,29 @@
             artifacts: 'karaf.log'
         - email-notification:
             email-prefix: '[{project}]'
+        - plot:
+          - title: '{01-plot-title}'
+            yaxis: '{01-plot-yaxis}'
+            group: '{01-plot-group}'
+            num-builds: ''
+            style: line
+            use-description: false
+            series:
+              - file: '{01-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+          - title: '{02-plot-title}'
+            yaxis: '{02-plot-yaxis}'
+            group: '{02-plot-group}'
+            num-builds: ''
+            style: line
+            use-description: false
+            series:
+              - file: '{02-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
 
 - job-template:
     name: '{project}-csit-1node-cds-{functionality}-{install}-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
index 0e8e34904d35ed4efbefaa6fcb9f8728ebc819c6..03397cdd1c72b6b17c87662b01e3f16da75a59aa 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
@@ -26,3 +26,13 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
+    # Plot Info
+    01-plot-title: 'Throughput Mode'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Cbench Performance'
+    01-plot-data-file: 'throughput.csv'
+    02-plot-title: 'Latency Mode'
+    02-plot-yaxis: 'flow_mods/sec'
+    02-plot-group: 'Cbench Performance'
+    02-plot-data-file: 'latency.csv'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index ba14f914e3ff9f4baea78c411195b2bda68040c6..05e1990b44a454f38162f6114dcd9ab745dac5a1 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -67,3 +67,13 @@
     vpnservice-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1423083445104'
     vtn-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414701949484'
     yangtools-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414695171776'
+
+    #plot stuff
+    01-plot-title: ''
+    01-plot-yaxis: ''
+    01-plot-group: 'Default Plot Group'
+    01-plot-data-file: 'plot-data.csv'
+    02-plot-title: ''
+    02-plot-yaxis: ''
+    02-plot-group: 'Default Plot Group'
+    02-plot-data-file: 'plot-data.csv'