From: Julien Danjou Date: Mon, 15 Oct 2018 12:30:33 +0000 (+0200) Subject: Update Mergify configuration to v2 X-Git-Tag: v3.2.0beta6~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25bde39539f8a393d4fc076e90cce6b53df31519;p=ceph-ansible.git Update Mergify configuration to v2 Signed-off-by: Julien Danjou --- diff --git a/.mergify.yml b/.mergify.yml index c5e86447e..99d7991ec 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,17 +1,86 @@ -rules: - default: - protection: - required_status_checks: - strict: true - contexts: - - "Testing: ceph-ansible PR Pipeline" - required_pull_request_reviews: - required_approving_review_count: 1 - merge_strategy: - method: rebase - automated_backport_labels: - backport-stable-3.0: stable-3.0 - backport-stable-3.1: stable-3.1 - disabling_label: DNM - disabling_files: - - .mergify.yml +pull_request_rules: + - name: automatic merge + conditions: + - label!=DNM + - '#approved-reviews-by>=1' + - 'status-success=Testing: ceph-ansible PR Pipeline' + actions: + merge: + method: rebase + rebase_fallback: merge + strict: smart + dismiss_reviews: {} + delete_head_branch: {} + - name: automatic merge on skip ci + conditions: + - label!=DNM + - title=~\[skip ci\] + - '#approved-reviews-by>=1' + actions: + merge: + method: rebase + rebase_fallback: merge + strict: smart + dismiss_reviews: {} + delete_head_branch: {} + - name: automerge backport 3.0 + conditions: + - author=mergify[bot] + - base=stable-3.0 + - label!=DNM + - 'status-success=Testing: ceph-ansible PR Pipeline' + actions: + merge: + method: rebase + rebase_fallback: merge + strict: smart + dismiss_reviews: {} + delete_head_branch: {} + - name: automerge backport 3.1 + conditions: + - author=mergify[bot] + - base=stable-3.1 + - label!=DNM + - 'status-success=Testing: ceph-ansible PR Pipeline' + actions: + merge: + method: rebase + rebase_fallback: merge + strict: smart + dismiss_reviews: {} + delete_head_branch: {} + - name: automerge backport 3.2 + conditions: + - author=mergify[bot] + - base=stable-3.2 + - label!=DNM + - 'status-success=Testing: ceph-ansible PR Pipeline' + actions: + merge: + method: rebase + rebase_fallback: merge + strict: smart + dismiss_reviews: {} + delete_head_branch: {} +# Backports + - actions: + backport: + branches: + - stable-3.0 + conditions: + - label=backport-stable-3.0 + name: backport stable-3.0 + - actions: + backport: + branches: + - stable-3.1 + conditions: + - label=backport-stable-3.1 + name: backport stable-3.1 + - actions: + backport: + branches: + - stable-3.2 + conditions: + - label=backport-stable-3.2 + name: backport stable-3.2