Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 5ee81e3ba4a3e338c084455a5d6d49d2fd7484fb..d24d982cd8041e66533b96e2a612a6d9d8078500 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -227,6 +227,7 @@
 
 - job-template:
     name: 'discovery-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -351,10 +352,7 @@
 
 - job-template:
     name: 'discovery-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
     #
@@ -422,10 +420,11 @@
 
 - job-template:
     name: 'discovery-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -482,6 +481,7 @@
 
 - job-template:
     name: 'discovery-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify