Simplify val-autorelease and distro-check state definition

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

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 872737e1c7b3f1a423f83dc89094bf896a9f54e9..178a69c87be34e1cef006af2830589810183a6cf 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -3,18 +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: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'
@@ -36,18 +30,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: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/boron'
@@ -69,18 +57,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: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/beryllium'