Rework the way Java version is set in CSIT 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..6aa47fe93ae6a194543b31601e2cd8291327f0e0 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -1,7 +1,7 @@
 - project:
     name: groupbasedpolicy-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
 
     # The project name
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,15 +28,11 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v ODL_VERSION:{stream}'
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: ''
+    trigger-jobs: 'odlparent-distribution-{stream},neutron-distribution-{stream},ovsdb-distribution-{stream},controller-distribution-{stream},openflowplugin-distribution-{stream},yangtools-distribution-{stream},sfc-distribution-{stream},dlux-distribution-{stream}'