Merge "Revert "Delete broken netconf csit job""

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index d332074735e39d86aab48508d88896becbeb48b9..2990ae18d4edb4f1be1ca2df305e9b19efe65afe 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -8,16 +8,23 @@
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'bulkomatic-perf-daily'
+    functionality:
+      - bulkomatic-perf-daily
+      - gate-bulkomatic-perf-daily
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
@@ -25,18 +32,18 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
 
     # Features to install
     install-features: >
-        odl-openflowplugin-flow-services-ui,
+        odl-openflowplugin-flow-services-rest,
         odl-openflowplugin-app-bulk-o-matic,
         odl-jolokia,
         decanter-collector-jmx,
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
+    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'