Switch mdsal-sonar to Java 21

[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 923d70ac247631f3faa53395a6d93bc5ad5d8546..b4c7ac8dc00a14ff1d9e65454a3d5eb49959ff83 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -1,45 +1,31 @@
+---
 - project:
     name: distribution-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'distribution'
+    project: "distribution"
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality: "userfeatures"
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    # TODO: Add Beryllium when everything is backported there.
+      - silicon:
+          branch: "master"
+          jre: "openjdk17"
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: "all"
 
     # Features to install
-    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
+    install-features: >
+      odl-restconf,
+      odl-distribution-version,
+      odl-netconf-topology,
+      odl-jolokia
 
     # Robot custom options
-    robot-options: '-v USE_NETCONF_CONNECTOR:True'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream},
-        integration-distribution-merge-{stream}
-
-    # Controller configuration
-    controller-image: 'centos7-java-builder-2c-8g'
-
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"