diff --git a/.mergify.yml b/.mergify.yml index 6aed0ccc17a..ac5fb46b4a8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -27,7 +27,26 @@ queue_rules: # Conditions to get out of the queue (= merged) - or: - and: - - base=release-v* + - base~=^(release-.+)$ + - "status-success=codespell" + - "status-success=multi-arch-build" + - "status-success=go-test" + - "status-success=golangci-lint" + - "status-success=mod-check" + - "status-success=lint-extras" + - "status-success=ci/centos/k8s-e2e-external-storage/1.26" + - "status-success=ci/centos/k8s-e2e-external-storage/1.27" + - "status-success=ci/centos/k8s-e2e-external-storage/1.28" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.26" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" + - "status-success=ci/centos/mini-e2e/k8s-1.26" + - "status-success=ci/centos/mini-e2e/k8s-1.27" + - "status-success=ci/centos/mini-e2e/k8s-1.28" + - "status-success=ci/centos/upgrade-tests-cephfs" + - "status-success=ci/centos/upgrade-tests-rbd" + - and: + - base=release-v3.9 - "status-success=codespell" - "status-success=multi-arch-build" - "status-success=go-test" @@ -110,7 +129,7 @@ pull_request_rules: - and: - author=dependabot[bot] - label!=DNM - - base=release-v* + - base~=^(release-.+)$ - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -176,7 +195,7 @@ pull_request_rules: - or: - and: - label!=DNM - - base=release-v* + - base~=^(release-.+)$ - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -235,7 +254,7 @@ pull_request_rules: conditions: - or: - and: - - base=release-v* + - base~=^(release-.+)$ - label!=DNM - label=ready-to-merge - "approved-reviews-by=@ceph/ceph-csi-maintainers"