Merge "Fix yamllint for yangide"

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

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 0209c75bdd6f5402f2a61608b7f5a6b17a8319de..a6954dc7834442aa524b6c0a66544ed194f8afc6 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -2,18 +2,13 @@
     name: vtn-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: 'vtn'
     project-name: 'vtn'
     branch: 'master'
@@ -38,18 +33,13 @@
     name: vtn-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: 'vtn'
     project-name: 'vtn'
     branch: 'stable/boron'
@@ -74,19 +64,13 @@
     name: vtn-beryllium
     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: False
-            disable_distribution_check: False
-
+    stream: beryllium
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/beryllium'