Merge "Adding installation for Syslog and Netflow"

[releng/builder.git] / jjb / ofextensions / circuitsw / circuitsw.yaml

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 185f7e81e75660a4db0ce82c5d5e4f699b8f5c6c..776c2c303a78a2d2d275d5a8ef7cc3dce6ce9572 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -229,8 +228,7 @@
 
 - job-template:
     name: 'circuitsw-periodic-{stream}'
-    # Temporarily disable until Rackspace networking issues are resolved
-    disabled: true
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -355,10 +353,7 @@
 
 - job-template:
     name: 'circuitsw-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
     #
@@ -426,12 +421,11 @@
 
 - job-template:
     name: 'circuitsw-sonar'
-    # Temporarily disable until Rackspace networking issues are resolved
-    disabled: true
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -488,8 +482,7 @@
 
 - job-template:
     name: 'circuitsw-clm-{stream}'
-    # Temporarily disable until Rackspace networking issues are resolved
-    disabled: true
+    disabled: false
 
     project-type: maven
     node: dynamic_verify