X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-userfeatures.yaml;h=66bb266555163d261560a065a3cf4aad83c6fa92;hb=d2dbe00f26c3fd709f069d917b6d466d7bda4115;hp=ab26168116fe7d955a3ca360e39df02b29488e9f;hpb=7c57608121e2286705cdd10332e4db9d9f54dd1d;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index ab2616811..90f876065 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -1,42 +1,43 @@
+---
 - 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:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-            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'
-            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'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
+
+    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-topology'
+    install-features: >
+        odl-restconf,
+        odl-netconf-mdsal,
+        odl-mdsal-apidocs,
+        odl-clustering-test-app,
+        odl-netconf-topology
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'