Merge "BUG-2625: validate l2switch using jdk8 only"

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

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 685e97a4b7e720da7d781f51059a5a28a9fcab31..8d230d56aa4bda4da7e8a641eb9f31e622e06f8c 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
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'armoury-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'armoury-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'armoury-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify