X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-csit-userfeatures.yaml;h=87665874a6846d4747d64b2390cc2753fee38efc;hb=07f269a86fc6a5582db6934ca6d92342aea3ba86;hp=a7faae523294a5a8636a0e0c36573f62b9a5b1fb;hpb=90a7b08bb7ef2cbbf24b5ba84c368d6b6576276b;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index a7faae523..87665874a 100644
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -2,8 +2,7 @@
 - project:
     name: distribution-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit4-1node-{functionality}-{install}-nitrogen'
+      - inttest-csit-1node
 
     # The project name
     project: 'distribution'
@@ -13,31 +12,14 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          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'
-      - 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.
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -46,6 +28,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1