diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index bcdcf68f2ff..ac395473356 100644 --- 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 index 61e5fd2e83a..d56b532f049 100644 --- 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"