Simplify val-autorelease and distro-check state definition

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

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index fdd39688ef31bc578fccec7843a59f5825deff41..0ce4a4f767d5c217fcb7b07bc4fe70c9f4f19bdf 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon
     project: 'next'
     project-name: 'next'
     branch: 'master'
@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron
     project: 'next'
     project-name: 'next'
     branch: 'stable/boron'
@@ -73,10 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: beryllium
     project: 'next'
     project-name: 'next'
     branch: 'stable/beryllium'