Merge "Fix validate-autorelease JAVA_HOME not set"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 8316a476cb5cebeabdf763c3a1813acd821c5945..60a8c5b9e8140e3d1321d56301a27f9953d4ef32 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -2,8 +2,7 @@
 - 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'
@@ -11,29 +10,33 @@
     # 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
 
     # Project branches
     stream:
-      - oxygen:
+      - aluminium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
 
     # Features to install
     install-features: >
         odl-restconf,
         odl-netconf-mdsal,
         odl-mdsal-apidocs,
+        odl-mdsal-model-inventory,
         odl-clustering-test-app,
         odl-netconf-topology