Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 50b40d690d6ee396770882a8d6054e38c6d34ee5..0ea91b17dc6029629ac0b68c28ca93abb41d9d63 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'next-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -353,10 +353,7 @@
 
 - job-template:
     name: 'next-integration-{stream}'
-    # Temporarily disable this job until Rackspace networking issues are
-    # resolved.
-    #disabled: DISABLED
-    disabled: true
+    disabled: false
 
     # Job template for ODL integration verify jobs
     #
@@ -424,10 +421,11 @@
 
 - job-template:
     name: 'next-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -484,6 +482,7 @@
 
 - job-template:
     name: 'next-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify