Make Java version for CSIT jobs configurable

[releng/builder.git] / jjb / integration / integration-distribution-jobs.yaml

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index fd2deac2ee4f9a411a9af3c531e3028f375c54f3..ed1676c7b5bbbf6af56b02accfb0a1f9096802bf 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -9,18 +9,18 @@
         - 'integration-patch-distribution-{stream}'
 
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
-        - beryllium:
+        - boron:
             branch: 'master'
-
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-
+            jdk: 'openjdk7'
         - stable-helium:
             branch: 'stable/helium'
-
-    jdk: 'openjdk7'
+            jdk: 'openjdk7'
 
 
 - job-template:
@@ -166,7 +166,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     wrappers:
         - build-timeout
@@ -215,7 +215,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     wrappers:
         - build-timeout