Simplify val-autorelease and distro-check state definition

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index b49e327a24cdc085f23294db947b16fcac9f7355..79ad710e216944a4c47da0f0f436fe2419dd8d8e 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.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: 'l2switch'
     project-name: 'l2switch'
     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: 'l2switch'
     project-name: 'l2switch'
     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: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/beryllium'