Merge "Add BUNDLE_URL Robot variable definition"

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

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 6e5d410ac329b4aafc54a32b57c82d01668fe021..7189780d4e07d736341ff12122142c3190eb20ae 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -134,8 +134,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -227,8 +227,7 @@
 
 - job-template:
     name: 'discovery-periodic-{stream}'
-    # Temporarily disable until Rackspace networking issues are resolved
-    disabled: true
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -244,8 +243,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -353,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
     #
@@ -424,12 +420,11 @@
 
 - job-template:
     name: 'discovery-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'
@@ -486,8 +481,7 @@
 
 - job-template:
     name: 'discovery-clm-{stream}'
-    # Temporarily disable until Rackspace networking issues are resolved
-    disabled: true
+    disabled: false
 
     project-type: maven
     node: dynamic_verify