Merge "Add BUNDLE_URL Robot variable definition"

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

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index a82900bc0ed36136b6b699b23d47af0ae5941d2c..829297925fafea64438fbce3c1f3ad84a9bd3d08 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -141,8 +141,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}'
 
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'nic-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -249,8 +250,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}'
 
@@ -358,10 +359,7 @@
 
 - job-template:
     name: 'nic-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: 'nic-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -489,6 +488,7 @@
 
 - job-template:
     name: 'nic-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify