Only use -all- job if it exists

[releng/builder.git] / jjb / controller / controller-csit-clustering.yaml

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 9bbdf02bfc4bdbe7a5d5ba355dbf00ff8e42ab58..04c3503155a3741b32d222d2547f0322a32afaf0 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -13,22 +13,22 @@
 
     # 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'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -37,7 +37,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Robot custom options