Merge "Only use -all- job if it exists"

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index c3ee0b48d7c91db95be6ced46ce21d192074bcd6..ddc1237d6c7cff2634c1c7480d617aebdfd2bb65 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: groupbasedpolicy-csit-6node
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
 
     # The project name
@@ -12,38 +13,34 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - 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'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: Ubuntu 14.04 - gbp - 20161031-0916
+    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
 
     # Features to install
-    install-features: 'odl-groupbasedpolicy-ofoverlay,
-                       odl-groupbasedpolicy-ui,
-                       odl-restconf-all'
+    install-features: >
+        odl-groupbasedpolicy-ofoverlay,
+        odl-groupbasedpolicy-ui,
+        odl-restconf-all
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:{stream}'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'groupbasedpolicy-distribution-{stream},
-                   neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'
+    robot-options: ''