Update automated project templates

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

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 1fb5f53bd4821f19c1e59706365e2632bbb85c0e..7189780d4e07d736341ff12122142c3190eb20ae 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -19,12 +19,18 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
             disable_autorelease: True
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+            disable_autorelease: True
 
     project: 'discovery'
 
@@ -128,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}'
 
@@ -221,6 +227,7 @@
 
 - job-template:
     name: 'discovery-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -236,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}'
 
@@ -413,10 +420,11 @@
 
 - job-template:
     name: 'discovery-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -473,6 +481,7 @@
 
 - job-template:
     name: 'discovery-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify