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

[releng/builder.git] / jjb / usc / usc.yaml

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index aad40236d4ad6842ef5ff1f339aa0798354d2327..98a2308b0cbab0ba94ba0e24813516e76bc6b5e8 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -19,20 +19,20 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
             disable_autorelease: False
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk8
@@ -236,6 +236,7 @@
 
 - job-template:
     name: 'usc-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,6 +429,7 @@
 
 - job-template:
     name: 'usc-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -488,6 +490,7 @@
 
 - job-template:
     name: 'usc-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify