]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Update Mergify configuration to v2
authorJulien Danjou <julien@danjou.info>
Mon, 15 Oct 2018 12:30:33 +0000 (14:30 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 15 Oct 2018 12:42:05 +0000 (14:42 +0200)
Signed-off-by: Julien Danjou <julien@danjou.info>
.mergify.yml

index c5e86447e4faccfbd6921ed94b9f36de11c7440b..99d7991ecd42f8f26d2604cb18d89b8ed37cbe47 100644 (file)
@@ -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