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 e098a9845e2788c6961d5cfc74c672bc30731ee3..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,22 +12,19 @@
 
     # 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
-    odl_system_flavor: 'v1-performance-4'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    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'