Merge "Fix for Pike/Queens Jobs"

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index d3c1820b6286581a21d33c85a75e6ed9758fae21..675fdf0c257563573cfe5fa8c93b58b2cba54812 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: groupbasedpolicy-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
 
     # The project name
@@ -12,26 +13,25 @@
 
     # Project branches
     stream:
-        - master:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
+      - all:
+          scope: 'all'
 
     # 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: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: ''