Simplify val-autorelease and distro-check state definition

[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 dc823235b2307b055c84688666dd080260ab86b5..0dfbb25ca20880acba1fbe166286ba14069363a2 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.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: 'of-config'
     project-name: 'of-config'
     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: 'of-config'
     project-name: 'of-config'
     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: 'of-config'
     project-name: 'of-config'
     branch: 'stable/beryllium'