Merge "Controller 3node: jolokia instead of netconf-connector"

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

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 1eba22982fc1abb1bbe540f4b8cc8c0194ac998a..c84c9012d8b7a90b9fdebea9656d09737fb3b6c7 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'sxp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,10 +433,11 @@
 
 - job-template:
     name: 'sxp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'sxp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify