From 33fed152bd6d36ba27d3b93dee1514928ee2574b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 15 Aug 2014 10:55:38 -0700
Subject: [PATCH] Add merge-check pipeline

And configure zuul and infra/config to use it.

Change-Id: I950644af6585cb7d31eb5073100b73150b3ab092
---
 .../openstack_project/files/zuul/layout.yaml  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 29d555dad7..d7bd4f2b3c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -231,8 +231,25 @@ pipelines:
     failure:
       gerrit: {}
 
+  - name: merge-check
+    description: >
+      Each time a change merges, this pipeline verifies that all open changes
+      on the same project are still mergable.
+    manager: IndependentPipelineManager
+    source: gerrit
+    trigger:
+      zuul:
+        - event: project-change-merged
+    merge-failure:
+      gerrit:
+        verified: -1
+
 
 project-templates:
+  - name: merge-check
+    merge-check:
+      - noop
+
   - name: python-jobs
     check:
       - 'gate-{name}-pep8'
@@ -2710,6 +2727,8 @@ projects:
       - bugdaystats-coverage
 
   - name: openstack-infra/config
+    template:
+      - name: merge-check
     check:
       - config-compare-xml
       - gate-config-layout
@@ -3178,8 +3197,8 @@ projects:
 
   - name: openstack-infra/zuul
     template:
+      - name: merge-check
       - name: publish-to-pypi
-    template:
       - name: python-jobs
     check:
       - dev-zuul-coverage