Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 8485e0843b2932fdb970ffd849569f28a2a6e82e..0d41cc9ded03564d9c28b6cc3c78a253a52f0952 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
@@ -14,23 +14,25 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
           scope: 'all'
 
+    # 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-app-table-miss-enforcer'
+    install-features: >
+        odl-openflowplugin-flow-services-rest,
+        odl-openflowplugin-app-table-miss-enforcer,
+        odl-openflowplugin-nxm-extensions
 
     # Robot custom options
     robot-options: ''
-
-    # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212