Merge "Only use -all- job if it exists"

[releng/builder.git] / jjb / netconf / netconf-userfeatures.yaml

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index e282eed991247cec34489602f7de7a9cc0f2c205..5c34f200e518d65bc3f2fdc0e61ad13177e591d5 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -9,13 +9,18 @@
     project: 'netconf'
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality:
+      - userfeatures
+      - gate-userfeatures
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -24,35 +29,26 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-          install-features: >
-              odl-restconf-all,
-              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-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'
 
+    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+
     # Features to install
     install-features: >
         odl-restconf,
         odl-netconf-mdsal,
+        odl-mdsal-apidocs,
         odl-clustering-test-app,
         odl-netconf-topology