Merge "Chore: update pre-commit repos revisions"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index ec9e174c7e8566ea9f674ccbf9179d9f4fb7a2b5..1bf4193a7c4fe964859ffc8ff0217499c381e65f 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -18,7 +18,7 @@
 
     # Project branches
     stream:
-      - phosphorus:
+      - master:
           branch: "master"
           jre: "openjdk11"
       - silicon:
@@ -27,22 +27,20 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
+
+    karaf-version: netconf
 
     install:
       - all:
           scope: "all"
 
-    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200901-040308.994"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210401-040235.479"
 
     # Features to install
     install-features: >
       odl-restconf,
       odl-netconf-mdsal,
       odl-mdsal-apidocs,
-      odl-mdsal-model-inventory,
       odl-clustering-test-app,
       odl-netconf-topology