X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-userfeatures.yaml;h=fdbd77aaa90ea0f827117a44f47d383cb80e8d44;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=811c8450fa54dd291034a00bb9721ade2ecf2cd7;hpb=144623a4ffd48ac6f459e158fbaf4cc73c3a3be2;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 811c8450f..fdbd77aaa 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -2,43 +2,32 @@
 - project:
     name: netconf-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: 'netconf'
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality:
+      - userfeatures
+      - gate-userfeatures
 
     # Project branches
     stream:
-      - nitrogen:
+      - neon:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-netconf-mdsal,
-              odl-mdsal-apidocs,
-              odl-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
+    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20180723-235516.505
+
     # Features to install
     install-features: >
         odl-restconf,