Dequeue changes immediately on merge conflicts
Change-Id: I4a2b9c5bc3a5659e874fe2bccbbd61da01713b9a
diff --git a/tests/fixtures/layout.yaml b/tests/fixtures/layout.yaml
index 37ea552..ed63e72 100644
--- a/tests/fixtures/layout.yaml
+++ b/tests/fixtures/layout.yaml
@@ -22,7 +22,7 @@
failure-message: Build failed. For information on how to proceed, see http://wiki.example.org/Test_Failures
trigger:
- event: comment-added
- approval:
+ approval:
- approved: 1
success:
verified: 2
@@ -38,7 +38,7 @@
dequeue-on-new-patchset: false
trigger:
- event: comment-added
- approval:
+ approval:
- approved: 1
- name: dup1
@@ -59,6 +59,21 @@
failure:
verified: -1
+ - name: conflict
+ dequeue-on-conflict: false
+ manager: DependentPipelineManager
+ failure-message: Build failed. For information on how to proceed, see http://wiki.example.org/Test_Failures
+ trigger:
+ - event: comment-added
+ approval:
+ - approved: 1
+ success:
+ verified: 2
+ submit: true
+ failure:
+ verified: -2
+ start:
+ verified: 0
jobs:
- name: ^.*-merge$
@@ -170,3 +185,9 @@
- node-project-merge:
- node-project-test1
- node-project-test2
+
+ - name: org/conflict-project
+ conflict:
+ - conflict-project-merge:
+ - conflict-project-test1
+ - conflict-project-test2