Merge "Update to global-jjb v0.29.0"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 138541bb299e55eed7f0bc512e2a51764169db92..b404b273f4e1b8f1fef7da48146815486f5105c6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -12,30 +12,25 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v2-standard-4'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v2-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:5000'
+    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:2000'
 
     # Plot Info
     01-plot-title: 'Throughput Mode'