Merge "Update cloud image CentOS7 builder x86_64"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index bc82b82130eadfd618ab410b6b3a01385175aa88..c4c9117c9de06477d89498bb67ad4023f29b0b07 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -5,42 +5,41 @@
       - inttest-csit-1node
 
     # The project name
-    project: 'netconf'
+    project: "netconf"
 
     # The functionality under test
     functionality:
       - userfeatures
       - userfeatures-rfc8040:
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True'
+          robot-options: "-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True"
       - gate-userfeatures
       - gate-userfeatures-rfc8040:
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True'
+          robot-options: "-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False -v USE_RFC8040:True"
 
     # Project branches
     stream:
-      - aluminium:
-          branch: 'master'
-          jre: 'openjdk11'
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
+      - master:
+          branch: "master"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+
+    karaf-version: netconf
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220201-040158.287"
 
     # Features to install
     install-features: >
-        odl-restconf,
-        odl-netconf-mdsal,
-        odl-mdsal-apidocs,
-        odl-mdsal-model-inventory,
-        odl-clustering-test-app,
-        odl-netconf-topology
+      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'
+    robot-options: "-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False"