X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin-csit-flow-services.yaml;h=8f5a5f895d204e4a3bf39e444b6905bc15c17b0d;hb=9df3f548230c398ce40a07501a6c2fa58f77134f;hp=995df97d4d06a86ab193dc9abea90421d5430f01;hpb=db6f3db7605863035e0d18b555ca9bcdb5b70c49;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 995df97d4..8130af298 100644
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -1,38 +1,39 @@
+---
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'flow-services'
+    functionality:
+      - flow-services
+      - gate-flow-services
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: 'karaf3'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
+
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,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 14.04 - mininet-ovs-2.5 - 20161031-0804
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'