Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index f9c453fce767d62f7486d301a9c7991f7b228b70..5b2aa95a799c0da08ea0b570f68836247837192a 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'aaa-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -364,10 +365,7 @@
 
 - job-template:
     name: 'aaa-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
     #
@@ -435,10 +433,11 @@
 
 - job-template:
     name: 'aaa-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -495,6 +494,7 @@
 
 - job-template:
     name: 'aaa-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify