Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index f8c680c0119cdbedfdeae4e8eb517ccc1d5e929d..701eb35c5e34730703c97b91114f5be2b3cf0ad6 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'capwap-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -358,10 +359,7 @@
 
 - job-template:
     name: 'capwap-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
     #
@@ -429,10 +427,11 @@
 
 - job-template:
     name: 'capwap-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -489,6 +488,7 @@
 
 - job-template:
     name: 'capwap-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify