Merge "Move sfc 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 bbf91ebc8eb02147138dfd2eaa9e04d44b752e2d..bc82b82130eadfd618ab410b6b3a01385175aa88 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -1,39 +1,46 @@
+---
 - 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'
 
     # 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:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-            install-features: 'odl-restconf,odl-netconf-mdsal,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'
-            install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-netconf-topology'
-            robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
+      - aluminium:
+          branch: 'master'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
+
+    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-topology'
+    install-features: >
+        odl-restconf,
+        odl-netconf-mdsal,
+        odl-mdsal-apidocs,
+        odl-mdsal-model-inventory,
+        odl-clustering-test-app,
+        odl-netconf-topology
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'