Revert "Update cloud image"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 53be57d709e506a072b0e5e1d5467546c9793508..ffbef7f1fa870a41c4c9408d03a40346f2356ccf 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,16 +10,25 @@
     # 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:
-      - sodium:
+      - silicon:
           branch: 'master'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
+          jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - all:
@@ -33,6 +41,7 @@
         odl-restconf,
         odl-netconf-mdsal,
         odl-mdsal-apidocs,
+        odl-mdsal-model-inventory,
         odl-clustering-test-app,
         odl-netconf-topology