commit 2da122a088877e226f219bd40b9e20276b85dbb3
author Clark Boylan <clark.boylan@gmail.com> Thu Aug 21 15:14:14 2014 -0700
committer Clark Boylan <clark.boylan@gmail.com> Thu Aug 21 16:40:26 2014 -0700
tree 291c8a187b22047f70e2d900871df692f3e7994a
parent 2532dd65c853b9874f9647f6f085a1a3808cb88b

Clean up bad layout files in zuul tests

Clean up the bad layout files in the zuul tests by removing a redundant
file (bad_pipeline and bad_pipeline1.yaml were identical). Annotate the
reason the layout is bad in each file. Finally remove a redundant swift
section. Both bad switf sections were failing for the same reason, a
missing name entry.

Change-Id: I0fd09da1fb0ec7443fa7d12a3b31809546a01afd

tests/fixtures/layouts/bad_pipelines10.yaml

diff --git a/tests/fixtures/layouts/bad_pipelines10.yaml b/tests/fixtures/layouts/bad_pipelines10.yaml
index 5248c17..ddde946 100644
--- a/tests/fixtures/layouts/bad_pipelines10.yaml
+++ b/tests/fixtures/layouts/bad_pipelines10.yaml
@@ -4,4 +4,5 @@
 
 projects:
   - name: foo
-    merge-mode: foo
\ No newline at end of file
+    # merge-mode must be one of merge, merge-resolve, cherry-pick.
+    merge-mode: foo