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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 8316a476c..b3a60ac3f 100644
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -2,40 +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
+      - 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:
-      - oxygen:
-          branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - master:
+          branch: "master"
+          jre: "openjdk11"
+
+    karaf-version: netconf
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220701-040013.395"
 
     # 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"