ci: update mergify rules to include teams

updated mergify rules to consider the teams approval to merge a PR. more details at #2367 fixes #2367 Signed-off-by: Madhu Rajanna <[email protected]>
ceph · Aug 25, 2021 · 0c4cf2a · 0c4cf2a
1 parent 55d3226
commit 0c4cf2a
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -36,8 +36,9 @@ pull_request_rules:
     conditions:
       - label!=DNM
       - base~=^(devel)|(release-.+)$
-      - "#approved-reviews-by>=2"
       - "#changes-requested-reviews-by=0"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "status-success=codespell"
       - "status-success=multi-arch-build"
       - "status-success=go-test"
@@ -64,7 +65,7 @@ pull_request_rules:
       - label!=DNM
       - label=ready-to-merge
       - base~=^(devel)|(release-.+)$
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "status-success=codespell"
       - "status-success=multi-arch-build"
       - "status-success=go-test"
@@ -122,7 +123,8 @@ pull_request_rules:
       - base=release-v2.0
       - label!=DNM
       - "#changes-requested-reviews-by=0"
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
     actions:
       merge: {}
       dismiss_reviews: {}
@@ -142,7 +144,8 @@ pull_request_rules:
       - base=release-v2.1
       - label!=DNM
       - "#changes-requested-reviews-by=0"
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
     actions:
       merge: {}
       dismiss_reviews: {}
@@ -162,7 +165,8 @@ pull_request_rules:
       - base=release-v3.0
       - label!=DNM
       - "#changes-requested-reviews-by=0"
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
     actions:
       merge: {}
       dismiss_reviews: {}
@@ -182,7 +186,8 @@ pull_request_rules:
       - base=release-v3.1
       - label!=DNM
       - "#changes-requested-reviews-by=0"
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "status-success=multi-arch-build"
       - "status-success=commitlint"
       - "status-success=ci/centos/mini-e2e-helm/k8s-1.20"
@@ -212,7 +217,8 @@ pull_request_rules:
       - author=mergify[bot]
       - base=release-v3.2
       - label!=DNM
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "status-success=codespell"
       - "status-success=multi-arch-build"
       - "status-success=go-test"
@@ -249,7 +255,8 @@ pull_request_rules:
       - author=mergify[bot]
       - base=release-v3.3
       - label!=DNM
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "status-success=codespell"
       - "status-success=multi-arch-build"
       - "status-success=go-test"
@@ -286,7 +293,8 @@ pull_request_rules:
       - author=mergify[bot]
       - base=release-v3.4
       - label!=DNM
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "status-success=codespell"
       - "status-success=multi-arch-build"
       - "status-success=go-test"
@@ -320,7 +328,8 @@ pull_request_rules:
     conditions:
       - label!=DNM
       - base=ci/centos
-      - "#approved-reviews-by>=2"
+      - "approved-reviews-by=@ceph/ceph-csi-contributors"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "#changes-requested-reviews-by=0"
       - "status-success=ci/centos/job-validation"
       - "status-success=ci/centos/jjb-validate"
@@ -334,7 +343,7 @@ pull_request_rules:
       - label!=DNM
       - label=ready-to-merge
       - base=ci/centos
-      - "#approved-reviews-by>=1"
+      - "approved-reviews-by=@ceph/ceph-csi-maintainers"
       - "#changes-requested-reviews-by=0"
       - "status-success=ci/centos/job-validation"
       - "status-success=ci/centos/jjb-validate"