Merge "Fix int/dist version in AR"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-perf-bulkomatic.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 27a3fabaf639931f9a80796dc40fa67abe7011d2..2918f17b240e1ca8b7f0b9915b880e111a87f482 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -5,7 +5,7 @@
       - inttest-csit-1node
 
     # The project name
-    project: 'openflowplugin'
+    project: "openflowplugin"
 
     # The functionality under test
     functionality:
@@ -14,40 +14,35 @@
 
     # Project branches
     stream:
+      - phosphorus:
+          branch: "master"
+          jre: "openjdk11"
       - silicon:
-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
+          branch: "stable/aluminium"
+          jre: "openjdk11"
 
     install:
       - only:
-          scope: 'only'
-
-    # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+          scope: "only"
 
     # Features to install
     install-features: >
-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-bulk-o-matic,
+      odl-jolokia
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125'
+    robot-options: "-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125"
 
     # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Java Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Java Performance'
-    02-plot-data-file: 'time.csv'
+    01-plot-title: "Flow Add rate"
+    01-plot-yaxis: "flow_mods/sec"
+    01-plot-group: "Java Performance"
+    01-plot-data-file: "rate.csv"
+    02-plot-title: "Flow Add time"
+    02-plot-yaxis: "seconds"
+    02-plot-group: "Java Performance"
+    02-plot-data-file: "time.csv"