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

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index ec4201a3b9f83f660fccaf7a05cead88693367a7..bbf7c065d327435889e3333851602f968a5f9e82 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -19,20 +19,20 @@
     # 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
                 - openjdk8
             disable_autorelease: False
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
 
     project: 'of-config'
 
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'of-config-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,6 +422,7 @@
 
 - job-template:
     name: 'of-config-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -481,6 +483,7 @@
 
 - job-template:
     name: 'of-config-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify