From 66f71aea3a42e0ca022225cb027738ddb9caf08c Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 2 Apr 2024 10:31:21 +0200 Subject: [PATCH] ci: remove auto merge condition auto merge for release-3.11 is already convered with regex check and we cannot auto merge PR to the devel branch. Removing unwanted checks. Signed-off-by: Madhu Rajanna --- .mergify.yml | 55 ---------------------------------------------------- 1 file changed, 55 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index eb12dad31..0551bcc2e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -200,35 +200,6 @@ pull_request_rules: - "status-success=ci/centos/mini-e2e/k8s-1.29" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - - and: - - label!=DNM - - base=release-v3.11 - - "#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=DCO" - - "status-success=codespell" - - "status-success=commitlint" - - "status-success=go-test" - - "status-success=golangci-lint" - - "status-success=lint-extras" - - "status-success=mod-check" - - "status-success=multi-arch-build" - - "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/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/k8s-1.29" - - "status-success=ci/centos/upgrade-tests-cephfs" - - "status-success=ci/centos/upgrade-tests-rbd" - and: - label!=DNM - base=release-v3.10 @@ -255,32 +226,6 @@ pull_request_rules: - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" - - and: - - label!=DNM - - base=devel - - "#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" - - "status-success=golangci-lint" - - "status-success=commitlint" - - "status-success=mod-check" - - "status-success=lint-extras" - - "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.27" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "status-success=ci/centos/mini-e2e/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.28" - - "status-success=ci/centos/mini-e2e/k8s-1.29" - - "status-success=ci/centos/upgrade-tests-cephfs" - - "status-success=ci/centos/upgrade-tests-rbd" - - "status-success=DCO" actions: queue: name: default