ci: update mergify rules for K8s v1.32

Signed-off-by: Praveen M <[email protected]>
ceph · Jan 6, 2025 · 6fff73b · 6fff73b
1 parent 18a62ec
commit 6fff73b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml
@@ -19,7 +19,13 @@ jobs:
     strategy:
       matrix:
         branch: [release-v3.12, release-v3.13, devel]
-        k8s: ["1.29", "1.30", "1.31"]
+        k8s: ["1.29", "1.30", "1.31", "1.32"]
+        exclude:
+          - k8s: "1.32"
+            branch: "release-v3.12"
+
+          - k8s: "1.32"
+            branch: "release-v3.13"
 
     # watch out, matrix.branch can not be used in this if-statement :-/
     if: >

diff --git a/.mergify.yml b/.mergify.yml
@@ -55,12 +55,15 @@ queue_rules:
               - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.30"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.31"
+              - "status-success=ci/centos/k8s-e2e-external-storage/1.32"
               - "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-helm/k8s-1.31"
+              - "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
               - "status-success=ci/centos/mini-e2e/k8s-1.29"
               - "status-success=ci/centos/mini-e2e/k8s-1.30"
               - "status-success=ci/centos/mini-e2e/k8s-1.31"
+              - "status-success=ci/centos/mini-e2e/k8s-1.32"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
           - and:
@@ -122,12 +125,15 @@ pull_request_rules:
       - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
       - "status-success=ci/centos/k8s-e2e-external-storage/1.30"
       - "status-success=ci/centos/k8s-e2e-external-storage/1.31"
+      - "status-success=ci/centos/k8s-e2e-external-storage/1.32"
       - "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-helm/k8s-1.31"
+      - "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
       - "status-success=ci/centos/mini-e2e/k8s-1.29"
       - "status-success=ci/centos/mini-e2e/k8s-1.30"
       - "status-success=ci/centos/mini-e2e/k8s-1.31"
+      - "status-success=ci/centos/mini-e2e/k8s-1.32"
       - "status-success=ci/centos/upgrade-tests-cephfs"
       - "status-success=ci/centos/upgrade-tests-rbd"
       - "status-success=DCO"
@@ -216,12 +222,15 @@ pull_request_rules:
               - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.30"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.31"
+              - "status-success=ci/centos/k8s-e2e-external-storage/1.32"
               - "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-helm/k8s-1.31"
+              - "status-success=ci/centos/mini-e2e-helm/k8s-1.32"
               - "status-success=ci/centos/mini-e2e/k8s-1.29"
               - "status-success=ci/centos/mini-e2e/k8s-1.30"
               - "status-success=ci/centos/mini-e2e/k8s-1.31"
+              - "status-success=ci/centos/mini-e2e/k8s-1.32"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
               - "status-success=DCO"