Merge "Fix yamllint for vbd"

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

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 8d72f8723977df13f3d7e9335dd2f31bafe0fdd8..b5fce1aebfc1ddc8606804fd3701a104fc1fff48 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -2,18 +2,13 @@
     name: infrautils-carbon
     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: False
-            disable_distribution_check: False
+    stream: carbon
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
@@ -34,18 +29,13 @@
     name: infrautils-boron
     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: False
-            disable_distribution_check: False
+    stream: boron
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/boron'
@@ -62,7 +52,6 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
-
 - project:
     name: infrautils-sonar
     jobs: