diff --git a/.mergify.yml b/.mergify.yml index 1f69ee8de..61e5fd2e8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -25,25 +25,22 @@ queue_rules: - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: - - base=release-v3.11 + - base=release-v3.12 - "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/k8s-e2e-external-storage/1.29" - - "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/k8s-e2e-external-storage/1.30" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "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/mini-e2e-helm/k8s-1.30" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" + - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: @@ -178,7 +175,7 @@ pull_request_rules: - "status-success=ci/centos/upgrade-tests-rbd" - and: - label!=DNM - - base=release-v3.11 + - base=release-v3.12 - "#approved-reviews-by>=2" - "#changes-requested-reviews-by=0" - "approved-reviews-by=@ceph/ceph-csi-contributors" @@ -190,18 +187,15 @@ pull_request_rules: - "status-success=commitlint" - "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/k8s-e2e-external-storage/1.29" - - "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/k8s-e2e-external-storage/1.30" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "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/mini-e2e-helm/k8s-1.30" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" + - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -266,7 +260,7 @@ pull_request_rules: - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" - and: - - base=release-v3.11 + - base=release-v3.12 - label!=DNM - label=ready-to-merge - "approved-reviews-by=@ceph/ceph-csi-maintainers" @@ -278,18 +272,15 @@ pull_request_rules: - "status-success=mod-check" - "status-success=lint-extras" - "#changes-requested-reviews-by=0" - - "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/k8s-e2e-external-storage/1.29" - - "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/k8s-e2e-external-storage/1.30" + - "status-success=ci/centos/k8s-e2e-external-storage/1.31" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "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/mini-e2e-helm/k8s-1.30" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.31" - "status-success=ci/centos/mini-e2e/k8s-1.29" + - "status-success=ci/centos/mini-e2e/k8s-1.30" + - "status-success=ci/centos/mini-e2e/k8s-1.31" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -298,15 +289,6 @@ pull_request_rules: name: default delete_head_branch: {} - - name: backport patches to release-v3.11 branch - conditions: - - base=devel - - label=backport-to-release-v3.11 - actions: - backport: - branches: - - release-v3.11 - - name: backport patches to release-v3.12 branch conditions: - base=devel @@ -316,6 +298,15 @@ pull_request_rules: branches: - release-v3.12 + - name: backport patches to release-v3.13 branch + conditions: + - base=devel + - label=backport-to-release-v3.13 + actions: + backport: + branches: + - release-v3.13 + - name: remove outdated approvals on ci/centos conditions: - base=ci/centos