From 5f02ec75da77295db1d0330dbca0109057cfa767 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 30 Nov 2023 21:14:27 +0100 Subject: [PATCH 1/2] ci: the release-v3.10 branch needs Kubernetes 1.28 jobs With Ceph-CSI v3.10 we do not test Kubernetes 1.25 anymore, and we expect Kubernetes 1.28 to be used. Signed-off-by: Niels de Vos --- .mergify.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 6aed0ccc17a..a698329d804 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -34,6 +34,25 @@ queue_rules: - "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" + - "status-success=golangci-lint" + - "status-success=mod-check" + - "status-success=lint-extras" - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" From f7e80939af254c3abdec63e72ba4f8d3085f8847 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 1 Dec 2023 10:14:41 +0100 Subject: [PATCH 2/2] ci: use regex comparing `~=` for `release-v*` branch checking It seems that `base=release-v*` does not match the `release-v3.10` branch for some reason. Maybe a Mergify update requires stricter checking of strings, and only allows the `~=` operator for regular expressions now? Regular expressions like `base~=^(devel)|(release-.+)$` seem to match for `release-3.10`, so let's use that notation everywhere. Signed-off-by: Niels de Vos --- .mergify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a698329d804..ac5fb46b4a8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -27,7 +27,7 @@ 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" @@ -129,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" @@ -195,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" @@ -254,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"