X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-csit-userfeatures.yaml;h=93ec5754542457e841a02a9b572f7c392a5fe0c7;hb=94dbade4c5d33fda5ce90eaceb527fc3c4b197e6;hp=a7faae523294a5a8636a0e0c36573f62b9a5b1fb;hpb=3f26f0d97606964d92ae8ef8b05c911a40f58e19;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index a7faae523..93ec57545 100644
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -3,7 +3,6 @@
     name: distribution-csit-userfeatures
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit4-1node-{functionality}-{install}-nitrogen'
 
     # The project name
     project: 'distribution'
@@ -13,31 +12,15 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - 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'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          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.
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -48,4 +31,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
+    odl_system_flavor: v1-performance-2