X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-userfeatures.yaml;h=baaf142194271f07aec4b3b21723ca7833abb065;hb=26c20ade21e2629099602ca890b9a67f2b9a2586;hp=51ca4f3ce01b6761daf44d1de3ac93ff175404f4;hpb=5e9656e4cac52ab5e622f68a999af3eeb450aa87;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 51ca4f3ce..baaf14219 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -1,38 +1,56 @@
+---
 - project:
     name: netconf-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-1node-{functionality}'
 
     # 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'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          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'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all'
+    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'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'
+    robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'