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

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

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index b300408ca57ce1f0d5cd0c3c69caca5cb79fc81b..3e8d1e2d09238d4e8c2db98fd1804a5dabdbf340 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -19,26 +19,25 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             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
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'ttp-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'ttp-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'ttp-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify