From 60c65d41965f9323f68b61be136d41b30b6afe89 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@ibm.com>
Date: Thu, 7 Dec 2023 10:16:55 +0100
Subject: [PATCH] ci: update Mergify config for automatic merging of backports
to 3.10
The `queue_rules` were updated earlier, but the rule for moving a
backport PR to the queue was not. By splitting the conditions for
release-v3.9 and other (newer) releases, the PRs can be queued with
their required Kubernetes version tests.
Signed-off-by: Niels de Vos <ndevos@ibm.com>
---
.mergify.yml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/.mergify.yml b/.mergify.yml
index ac5fb46b4a8..935e40cc1b9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -200,6 +200,32 @@ pull_request_rules:
- "#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/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:
+ - label!=DNM
+ - base=release-v3.9
+ - "#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"