Only use -all- job if it exists

[releng/builder.git] / jjb / integration / distribution / distribution-csit-userfeatures.yaml

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index f2e5f6b494ce7b2c8ddb47a01a1ecb8e5b273837..39ef9bcc9edf92ec52d44ee34130df5647d482b2 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -12,28 +12,26 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - 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'
-          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'