Make Java version for CSIT jobs configurable

[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 6876e6a2c99b0611d521496e4cea74b17f3950ac..da95b78c1281c6f9eeca1caeac4314cf7caa4dc8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -32,7 +37,14 @@
     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: 'neutron-distribution-{stream},ovsdb-distribution-{stream},controller-distribution-{stream},openflowplugin-distribution-{stream},yangtools-distribution-{stream},sfc-distribution-{stream},dlux-distribution-{stream}'
+    trigger-jobs: 'groupbasedpolicy-distribution-{stream},
+                   neutron-distribution-{stream},
+                   ovsdb-distribution-{stream},
+                   controller-distribution-{stream},
+                   openflowplugin-distribution-{stream},
+                   yangtools-distribution-{stream},
+                   sfc-distribution-{stream},
+                   dlux-distribution-{stream}'