ci: do not require Kubernetes 1.26 tests for the devel branch

Kubernetes 1.26 is End-Of-Life, the next version of Ceph-CSI will not support that anymore. Signed-off-by: Niels de Vos <[email protected]>
ceph · Apr 23, 2024 · 94b14e4 · 94b14e4
1 parent 058426d
commit 94b14e4
Showing 1 changed file with 1 addition and 32 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -27,22 +27,19 @@ queue_rules:
       # Conditions to get out of the queue (= merged)
       - or:
           - and:
-              - base~=^(release-.+)$
+              - base~=^(release-.+)|devel$
               - "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"
@@ -67,25 +64,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=devel
-              - "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"
           - and:
               - base=ci/centos
               - "status-success=ci/centos/job-validation"
@@ -142,15 +120,12 @@ pull_request_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/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"
@@ -187,15 +162,12 @@ pull_request_rules:
               - "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"
@@ -248,15 +220,12 @@ pull_request_rules:
               - "status-success=mod-check"
               - "status-success=lint-extras"
               - "#changes-requested-reviews-by=0"
-              - "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"