From 78e42b51aa591a6d482fbe80bef6eeec96fec750 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 31 Jul 2014 21:59:22 +0000 Subject: [PATCH] Make recheck and reverify synonymous * modules/openstack_project/files/zuul/layout-dev.yaml * modules/openstack_project/files/zuul/layout.yaml: With the freshness checks now in place, the circumstances under which recheck vs. reverify are useful is less clear-cut and the eventual outcome of either is basically the same. Go ahead and just make them work the same in all circumstances to reduce developer confusion. Change-Id: Ifbb5c67894cb436b11f69aff2d9da1140dcdaa55 --- modules/openstack_project/files/zuul/layout-dev.yaml | 6 +++--- modules/openstack_project/files/zuul/layout.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml index c6043d7d0d..d55eab0821 100644 --- a/modules/openstack_project/files/zuul/layout-dev.yaml +++ b/modules/openstack_project/files/zuul/layout-dev.yaml @@ -12,7 +12,7 @@ pipelines: - event: patchset-created - event: change-restored - event: comment-added - comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*recheck + comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*(recheck|reverify) success: gerrit: verified: 1 @@ -31,7 +31,7 @@ pipelines: approval: - workflow: 1 - event: comment-added - comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*reverify + comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*(recheck|reverify) start: gerrit: verified: 0 @@ -89,7 +89,7 @@ pipelines: gerrit: - event: patchset-created - event: comment-added - comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*recheck + comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*(recheck|reverify) - name: experimental description: On-demand pipeline for requesting a run against a set of jobs that are not yet gating. Leave review comment of "check experimental" to run jobs in this pipeline. diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 6d76fde8c9..46cfe1df21 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -15,7 +15,7 @@ pipelines: - event: patchset-created - event: change-restored - event: comment-added - comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck + comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(recheck|reverify) - event: comment-added require-approval: - username: jenkins @@ -27,7 +27,7 @@ pipelines: - username: jenkins older-than: 24h - event: comment-added - comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*reverify + comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(recheck|reverify) require-approval: - workflow: 1 - username: jenkins @@ -126,7 +126,7 @@ pipelines: gerrit: - event: patchset-created - event: comment-added - comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck + comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(recheck|reverify) - name: experimental description: On-demand pipeline for requesting a run against a set of jobs that are not yet gating. Leave review comment of "check experimental" to run jobs in this pipeline. @@ -196,7 +196,7 @@ pipelines: - event: patchset-created - event: change-restored - event: comment-added - comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck + comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(recheck|reverify) success: gerrit: {} failure: