X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-csit-userfeatures.yaml;h=6b957a33eebea4639536fd6c17b9ec91b952d07b;hb=cc8157a0f8b79e4e4ecae4fffb73f27a97e582c0;hp=5deaf61e74624a2e9866bc33b2001a1e11717e34;hpb=29b2f25826a1d889aa515be1c39c40da83f7ae00;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 5deaf61e7..6b957a33e 100644
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -2,46 +2,31 @@
 - project:
     name: distribution-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'distribution'
+    project: "distribution"
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality: "userfeatures"
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
-
-    # TODO: Add Beryllium when everything is backported there.
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
 
     install:
-      - only:
-          scope: 'only'
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
-    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-topology,odl-jolokia'
+    install-features: >
+      odl-restconf,
+      odl-restconf-nb-bierman02,
+      odl-distribution-version,
+      odl-netconf-topology,
+      odl-jolokia
 
     # Robot custom options
-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"