X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-userfeatures.yaml;h=8316a476cb5cebeabdf763c3a1813acd821c5945;hb=af5db172e1f45cc23687401437554941187c087b;hp=2b4c903d40e5019eb9b80635e5cfd8c8a602381c;hpb=ece6a462c2e9580514d1e610d8f81c1e805e6685;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 2b4c903d4..7961141c6 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -2,62 +2,41 @@
 - project:
     name: netconf-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'netconf'
+    project: "netconf"
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality:
+      - userfeatures
+      - userfeatures-rfc8040:
+          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"
 
     # Project branches
     stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-netconf-mdsal,
-              odl-mdsal-apidocs,
-              odl-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-netconf-mdsal,
-              odl-mdsal-apidocs,
-              odl-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
+      - master:
+          branch: "master"
+          jre: "openjdk17"
+
+    karaf-version: netconf
 
     install:
-      - only:
-          scope: 'only'
       - all:
-          scope: 'all'
+          scope: "all"
+
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20230101-040125.332"
 
     # Features to install
     install-features: >
-        odl-restconf,
-        odl-netconf-mdsal,
-        odl-mdsal-apidocs,
-        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"