diff --git a/.mergify.yml b/.mergify.yml index 8381415a2..16cc2270f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -37,23 +37,6 @@ queue_rules: - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - - and: - - base=release-v3.4 - - "status-success=codespell" - - "status-success=multi-arch-build" - - "status-success=go-test" - - "status-success=commitlint" - - "status-success=golangci-lint" - - "status-success=mod-check" - - "status-success=lint-extras" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.21" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.22" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.23" - - "status-success=ci/centos/mini-e2e/k8s-1.21" - - "status-success=ci/centos/mini-e2e/k8s-1.22" - - "status-success=ci/centos/mini-e2e/k8s-1.23" - - "status-success=ci/centos/upgrade-tests-cephfs" - - "status-success=ci/centos/upgrade-tests-rbd" - and: - base=ci/centos - "status-success=ci/centos/job-validation" @@ -218,44 +201,6 @@ pull_request_rules: actions: queue: name: default - - name: backport patches to release-v3.4 branch - conditions: - - base=devel - - label=backport-to-release-v3.4 - actions: - backport: - branches: - - release-v3.4 - # automerge backports if CI successfully ran - - name: automerge backport release-v3.4 - conditions: - - author=mergify[bot] - - base=release-v3.4 - - label!=DNM - - "#approved-reviews-by>=2" - - "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" - - "status-success=commitlint" - - "status-success=golangci-lint" - - "status-success=mod-check" - - "status-success=lint-extras" - - "#changes-requested-reviews-by=0" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.21" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.22" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.23" - - "status-success=ci/centos/mini-e2e/k8s-1.21" - - "status-success=ci/centos/mini-e2e/k8s-1.22" - - "status-success=ci/centos/mini-e2e/k8s-1.23" - - "status-success=ci/centos/upgrade-tests-cephfs" - - "status-success=ci/centos/upgrade-tests-rbd" - - "status-success=DCO" - actions: - queue: - name: default - delete_head_branch: {} - name: backport patches to release-v3.6 branch conditions: - base=devel