Merge "Remove of-config carbon jobs"

[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 3d95758b5e8bb87d28e63fbd156215fd4384f579..7bf4f2a3b8a7ef17c4d1907da6ffac35cbc2386f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-cbench
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
@@ -12,23 +12,25 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041'
+
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
+    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Plot Info
     01-plot-title: 'Throughput Mode'