Only use -all- job if it exists

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-3node.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 8c5c5e798d87c87cd4be299b5ff5fae61e479b44..8747504cd2455a407f445b78f7c0e6869a8df6c1 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -12,28 +12,28 @@
 
     # 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'
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
-    tools_system_image: Ubuntu 14.04 - gbp - 20170210-0536
+    tools_system_image: Ubuntu 14.04 - gbp - 20170808-0524
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'