Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index e8e5759631795376589c2afde4f8e0ec6b7f6290..cafb24120d540d89c2087a69a61e7171d4f966d8 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -228,8 +228,7 @@
 
 - job-template:
     name: 'netconf-periodic-{stream}'
-    # Temporarily disable until Rackspace networking issues are resolved
-    disabled: true
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -354,10 +353,7 @@
 
 - job-template:
     name: 'netconf-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
     #
@@ -425,12 +421,11 @@
 
 - job-template:
     name: 'netconf-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'
@@ -487,8 +482,7 @@
 
 - job-template:
     name: 'netconf-clm-{stream}'
-    # Temporarily disable until Rackspace networking issues are resolved
-    disabled: true
+    disabled: false
 
     project-type: maven
     node: dynamic_verify