Re-enable zuultrigger test
This gets both running again, but the second fails because of a
behavior change in v3 which should be addressed separately.
Story: 2000773
Task: 3422
Change-Id: I3d0e7268304e97fa611f70706e15212952aa3c62
diff --git a/tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml b/tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml
new file mode 100644
index 0000000..eb6bf1c
--- /dev/null
+++ b/tests/fixtures/config/zuultrigger/project-change-merged/git/common-config/zuul.yaml
@@ -0,0 +1,65 @@
+- pipeline:
+ name: check
+ manager: independent
+ source: gerrit
+ trigger:
+ gerrit:
+ - event: patchset-created
+ success:
+ gerrit:
+ verified: 1
+ failure:
+ gerrit:
+ verified: -1
+
+- pipeline:
+ name: gate
+ manager: dependent
+ failure-message: Build failed. For information on how to proceed, see http://wiki.example.org/Test_Failures
+ source: gerrit
+ trigger:
+ gerrit:
+ - event: comment-added
+ approval:
+ - approved: 1
+ success:
+ gerrit:
+ verified: 2
+ submit: true
+ failure:
+ gerrit:
+ verified: -2
+ start:
+ gerrit:
+ verified: 0
+ precedence: high
+
+- pipeline:
+ name: merge-check
+ manager: independent
+ source: gerrit
+ ignore-dependencies: true
+ trigger:
+ zuul:
+ - event: project-change-merged
+ merge-failure:
+ gerrit:
+ verified: -1
+
+- job:
+ name: project-check
+
+- job:
+ name: project-gate
+
+- project:
+ name: org/project
+ check:
+ jobs:
+ - project-check
+ gate:
+ jobs:
+ - project-gate
+ merge-check:
+ jobs:
+ - noop
diff --git a/tests/fixtures/config/zuultrigger/project-change-merged/git/org_project/README b/tests/fixtures/config/zuultrigger/project-change-merged/git/org_project/README
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/fixtures/config/zuultrigger/project-change-merged/git/org_project/README
diff --git a/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml b/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml
new file mode 100644
index 0000000..a22ed5c
--- /dev/null
+++ b/tests/fixtures/config/zuultrigger/project-change-merged/main.yaml
@@ -0,0 +1,6 @@
+- tenant:
+ name: tenant-one
+ source:
+ gerrit:
+ config-repos:
+ - common-config