X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-userfeatures.yaml;h=98542632cce26e47bd6e08809bbdeb0dda319e6e;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=e74deb1e399c55021699bb61bae830112cfbff1a;hpb=eee5e84d3fc452de732288f9285d59582dd5a541;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index e74deb1e3..98542632c 100644
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -2,60 +2,37 @@
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality:
+      - userfeatures
+      - gate-userfeatures
 
     # Project branches
     stream:
-      - carbon:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-pcep-all,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-pcep,
-              odl-netconf-connector-all,
-              odl-bgpcep-bmp,
-              odl-jolokia
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-pcep-all,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-pcep,
-              odl-netconf-connector-all,
-              odl-bgpcep-bmp,
-              odl-jolokia
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
     # Features to install
-    # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
     install-features: >
         odl-restconf,
         odl-bgpcep-pcep,
         odl-bgpcep-bgp,
-        odl-bgpcep-bmp,odl-jolokia
+        odl-bgpcep-bgp-config-example,
+        odl-bgpcep-bmp,
+        odl-bgpcep-bmp-config-example,
+        odl-jolokia
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'