Merge "Move unimgr Sonar scan to Sonarcloud"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 9b6af63a8b3a509f1621c33f0fba18695dcbdf9b..bc82b82130eadfd618ab410b6b3a01385175aa88 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -3,7 +3,6 @@
     name: netconf-csit-userfeatures
     jobs:
       - inttest-csit-1node
-      - inttest-csit-verify-1node
 
     # The project name
     project: 'netconf'
@@ -11,26 +10,35 @@
     # 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:
-      - fluorine:
+      - aluminium:
           branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - all:
           scope: 'all'
 
-    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227
 
     # Features to install
     install-features: >
         odl-restconf,
         odl-netconf-mdsal,
         odl-mdsal-apidocs,
+        odl-mdsal-model-inventory,
         odl-clustering-test-app,
         odl-netconf-topology