Merge "Add support for jdk11 in magnesium"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 1fe61a7531b64a9ee0cd134100a165de8f983040..07b0467346be18244e4819657fc28fae3d598dad 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -15,25 +15,27 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - magnesium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
 
     install:
       - all:
           scope: 'all'
 
-    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 
     # Features to install
     install-features: >
         odl-restconf,
         odl-netconf-mdsal,
         odl-mdsal-apidocs,
+        odl-mdsal-model-inventory,
         odl-clustering-test-app,
         odl-netconf-topology