Merge "Add BUNDLE_URL Robot variable definition"

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 11abd14f9f132522dc5ada76655c33c5f4cb6d45..749b6b8adac6abe2ddeadc36b4893142c3c2d6c9 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.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: 'neutron-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}'
 
@@ -426,10 +427,11 @@
 
 - job-template:
     name: 'neutron-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -486,6 +488,7 @@
 
 - job-template:
     name: 'neutron-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify