Merge "BUG-2625: validate centinel using jdk8 only"

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

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 4016e53b396f9964c67202b4bcb9ee6bff062351..476b044d83fdf000430c341134c98bf5e7c6c1b6 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -14,9 +14,15 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk8
+            jdks:
+                - openjdk8
+            disable_autorelease: False
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7
@@ -32,10 +38,11 @@
 
 - job-template:
     name: 'distribution-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -92,6 +99,7 @@
 
 - job-template:
     name: 'distribution-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify