Merge "Readjust Calcium jobs"

[releng/builder.git] / jjb / integration / distribution / distribution-csit-userfeatures.yaml

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 8427aaf683f60c365de3df8b2ccf72903a100629..b4c7ac8dc00a14ff1d9e65454a3d5eb49959ff83 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -14,22 +14,18 @@
     stream:
       - silicon:
           branch: "master"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
+          jre: "openjdk17"
 
     install:
       - all:
           scope: "all"
 
     # Features to install
-    install-features: "odl-restconf,odl-distribution-version,odl-netconf-topology,odl-jolokia"
+    install-features: >
+      odl-restconf,
+      odl-distribution-version,
+      odl-netconf-topology,
+      odl-jolokia
 
     # Robot custom options
     robot-options: "-v USE_NETCONF_CONNECTOR:False"