Merge "Clean up bad layout files in zuul tests"

tests/fixtures/layouts/bad_merge_failure.yaml

@@ -10,6 +10,7 @@ pipelines:
     failure:
       gerrit:
         verified: -1
+    # merge-failure-message needs a string.
     merge-failure-message:
 
   - name: gate

tests/fixtures/layouts/bad_pipelines

@@ -1 +0,0 @@
-pipelines:

tests/fixtures/layouts/bad_pipelines1.yaml

@@ -1,2 +1,2 @@
+# Pipelines completely missing. At least one is required.
 pipelines:
-

tests/fixtures/layouts/bad_pipelines10.yaml

@@ -4,4 +4,5 @@ pipelines:
 
 projects:
   - name: foo
-    merge-mode: foo
+    # merge-mode must be one of merge, merge-resolve, cherry-pick.
+    merge-mode: foo

tests/fixtures/layouts/bad_pipelines2.yaml

@@ -1,4 +1,5 @@
 pipelines:
+  # name is required for pipelines
   - noname: check
     manager: IndependentPipelineManager
 

tests/fixtures/layouts/bad_pipelines3.yaml

@@ -1,5 +1,7 @@
 pipelines:
   - name: check
+    # The manager must be one of IndependentPipelineManager
+    # or DependentPipelineManager
     manager: NonexistentPipelineManager
 
 projects:

tests/fixtures/layouts/bad_pipelines4.yaml

@@ -3,6 +3,7 @@ pipelines:
     manager: IndependentPipelineManager
     trigger:
       gerrit:
+        # non-event is not a valid gerrit event
         - event: non-event
 
 projects:

tests/fixtures/layouts/bad_pipelines5.yaml

@@ -3,6 +3,7 @@ pipelines:
     manager: IndependentPipelineManager
     trigger:
       gerrit:
+        # event is a required item but it is missing.
         - approval:
             - approved: 1
 

tests/fixtures/layouts/bad_pipelines6.yaml

@@ -4,6 +4,7 @@ pipelines:
     trigger:
       gerrit:
         - event: comment-added
+          # approved is not a valid entry. Should be approval.
           approved: 1
 
 projects:

tests/fixtures/layouts/bad_pipelines7.yaml

@@ -1,4 +1,5 @@
 pipelines:
+  # The pipeline must have a name.
   - manager: IndependentPipelineManager
 
 projects:

tests/fixtures/layouts/bad_pipelines8.yaml

@@ -1,4 +1,5 @@
 pipelines:
+  # The pipeline must have a manager
   - name: check
 
 projects:

tests/fixtures/layouts/bad_pipelines9.yaml

@@ -1,4 +1,5 @@
 pipelines:
+  # Names must be unique.
   - name: check
     manager: IndependentPipelineManager
   - name: check

tests/fixtures/layouts/bad_projects1.yaml

@@ -4,6 +4,7 @@ pipelines:
 
 projects:
   - name: foo
+  # gate pipeline is not defined.
     gate:
       - test
 

tests/fixtures/layouts/bad_projects2.yaml

@@ -5,5 +5,6 @@ pipelines:
 projects:
   - name: foo
     check:
+      # Indentation is one level too deep on the last line.
       - test
         - foo

tests/fixtures/layouts/bad_swift.yaml

@@ -16,11 +16,10 @@ jobs:
     swift:
       - name: logs
   - name: ^.*-merge$
+    # swift requires a name
     swift:
         container: merge_assets
     failure-message: Unable to merge change
-  - name: test-test
-    swift:
 
 projects:
   - name: test-org/test

tests/fixtures/layouts/bad_template1.yaml

@@ -10,7 +10,7 @@ pipelines:
 project-templates:
   - name: template-generic
     check:
-     # Template uses the 'project' parameter' which must
+     # Template uses the 'project' parameter' which must be provided
      - '{project}-merge'
 
 projects: