X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-userfeatures.yaml;h=90f8760655ec93fdf2cea04b0859df52b5b740c4;hb=d2dbe00f26c3fd709f069d917b6d466d7bda4115;hp=fdf269f6875d1ffbefeca5d4c5b34be86255eeec;hpb=190f9a3e4e36bfbb01d02e640f8cb6dc05202382;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index fdf269f68..90f876065 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -2,57 +2,40 @@
 - 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:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - 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-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-netconf-mdsal,
-              odl-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
+    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
+
     # Features to install
     install-features: >
         odl-restconf,
         odl-netconf-mdsal,
+        odl-mdsal-apidocs,
         odl-clustering-test-app,
         odl-netconf-topology