ci: include k8s 1.30 tests for release-v3.11

This commit includes k8s 1.30 tests for release-v3.11

Signed-off-by: Praveen M <m.praveen@ibm.com>

.github/workflows/pull-request-commentor.yaml

@@ -27,10 +27,6 @@ jobs:
           - k8s: "1.26"
             branch: "devel"
 
-          # Ceph-CSI <= 3.11 was released before Kubernetes 1.30
-          - k8s: "1.30"
-            branch: "release-v3.11"
-
           # Ceph-CSI <= 3.10 was released before Kubernetes 1.29
           - k8s: "1.29"
             branch: "release-v3.10"

.mergify.yml

@@ -27,7 +27,7 @@ queue_rules:
       # Conditions to get out of the queue (= merged)
       - or:
           - and:
-              - base~=^(release-.+)$
+              - base~=^(devel)|(release-.+)$
               - "status-success=codespell"
               - "status-success=multi-arch-build"
               - "status-success=go-test"
@@ -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=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/k8s-e2e-external-storage/1.30"
-              - "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-helm/k8s-1.30"
-              - "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/mini-e2e/k8s-1.30"
-              - "status-success=ci/centos/upgrade-tests-cephfs"
-              - "status-success=ci/centos/upgrade-tests-rbd"
           - and:
               - base=ci/centos
               - "status-success=ci/centos/job-validation"
@@ -177,7 +155,7 @@ pull_request_rules:
       - or:
           - and:
               - label!=DNM
-              - base~=^(release-.+)$
+              - base~=^(devel)|(release-.+)$
               - "#approved-reviews-by>=2"
               - "#changes-requested-reviews-by=0"
               - "approved-reviews-by=@ceph/ceph-csi-contributors"
@@ -204,6 +182,7 @@ pull_request_rules:
               - "status-success=ci/centos/mini-e2e/k8s-1.30"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
+              - "status-success=DCO"
           - and:
               - label!=DNM
               - base=release-v3.10
@@ -230,35 +209,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/k8s-e2e-external-storage/1.30"
-              - "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-helm/k8s-1.30"
-              - "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/mini-e2e/k8s-1.30"
-              - "status-success=ci/centos/upgrade-tests-cephfs"
-              - "status-success=ci/centos/upgrade-tests-rbd"
-              - "status-success=DCO"
     actions:
       queue:
         name: default
@@ -268,7 +218,7 @@ pull_request_rules:
     conditions:
       - or:
           - and:
-              - base~=^(release-.+)$
+              - base~=^(devel)|(release-.+)$
               - label!=DNM
               - label=ready-to-merge
               - "approved-reviews-by=@ceph/ceph-csi-maintainers"