Merge "Make Java version for CSIT jobs configurable"

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 5cdadb56dbc35e8f73a628b49ab917c49b72a411..8f00ec06ec2001a19a82f086d04d1edaf784ddc2 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -236,6 +235,7 @@
 
 - job-template:
     name: 'usc-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -428,10 +428,11 @@
 
 - job-template:
     name: 'usc-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -488,6 +489,7 @@
 
 - job-template:
     name: 'usc-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify