Simplify val-autorelease and distro-check state definition

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

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 08ad24273291df8fb6d25c4cda1598fbb50edfb8..70835525a0e82d7875bb95cda43ed775edec10bd 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -3,17 +3,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - carbon:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: carbon
     project: 'persistence'
     project-name: 'persistence'
     branch: 'master'
@@ -36,17 +31,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: boron
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/boron'
@@ -69,16 +59,12 @@
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
+
+    stream: beryllium
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/beryllium'