Merge "Add BUNDLE_URL Robot variable definition"

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

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 685e97a4b7e720da7d781f51059a5a28a9fcab31..388f205b80ccb75ee1b711644ae9b1d256ca63c7 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -19,15 +19,15 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7
             disable_autorelease: True
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk8
             jdks:
                 - openjdk8
@@ -136,8 +136,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}'
 
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'armoury-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -244,8 +245,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}'
 
@@ -421,10 +422,11 @@
 
 - job-template:
     name: 'armoury-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'armoury-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify