From 01ca536a56ab62616d0fe34e72cd533753a57aa0 Mon Sep 17 00:00:00 2001 From: karthik-us Date: Tue, 2 Apr 2024 21:41:14 +0530 Subject: [PATCH 1/4] ci: upgrade_version update Updating the CSI_UPGRADE_VERSION to the latest release. Signed-off-by: karthik-us --- build.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.env b/build.env index d63bec48ced..af5b5debdb7 100644 --- a/build.env +++ b/build.env @@ -12,7 +12,7 @@ CSI_IMAGE_VERSION=canary # cephcsi upgrade version -CSI_UPGRADE_VERSION=v3.10.2 +CSI_UPGRADE_VERSION=v3.11.0 # Ceph version to use BASE_IMAGE=quay.io/ceph/ceph:v18 From 884d49e2ab06ce142062ded3dc4ae75c085de98d Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 2 Apr 2024 10:21:09 +0200 Subject: [PATCH 2/4] ci: remove mergify rules for 3.11 we dont need a new mergify rule for 3.11 branch and the default mergirfy with regex for `^(release-.+)$` branch will cover it. Signed-off-by: Madhu Rajanna --- .mergify.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 50c2df9cb86..e2d698438f2 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -67,28 +67,6 @@ queue_rules: - "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.11 - - "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/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: - base=devel - "status-success=codespell" From 61eec7e9c8f57b56888847e3d4708c3e75281ae8 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 2 Apr 2024 10:29:48 +0200 Subject: [PATCH 3/4] ci: remove condition for dependabot dependabot will not create PR on the release branch and for that reason removing unused rule Signed-off-by: Madhu Rajanna --- .mergify.yml | 81 ++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 53 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index e2d698438f2..eb12dad318a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -128,59 +128,34 @@ pull_request_rules: - name: update dependencies by dependabot (skip commitlint) conditions: - - or: - - and: - - author=dependabot[bot] - - label!=DNM - - base~=^(release-.+)$ - - "#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=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" - - "status-success=DCO" - - and: - - author=dependabot[bot] - - 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=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" + - author=dependabot[bot] + - 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=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/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" + - "status-success=DCO" actions: queue: name: default From 66f71aea3a42e0ca022225cb027738ddb9caf08c Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 2 Apr 2024 10:31:21 +0200 Subject: [PATCH 4/4] 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 eb12dad318a..0551bcc2e9b 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