From 210d47093ed6f273a9f42d3f5a1b9ef606938000 Mon Sep 17 00:00:00 2001 From: Praveen M Date: Mon, 6 Jan 2025 15:32:37 +0530 Subject: [PATCH] ci: update mergify rules to drop K8s v1.29 from devel Signed-off-by: Praveen M --- .github/workflows/pull-request-commentor.yaml | 2 +- .mergify.yml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 851b8f4780e..3bc977f7ea2 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -19,7 +19,7 @@ jobs: strategy: matrix: branch: [release-v3.12, release-v3.13, devel] - k8s: ["1.29", "1.30", "1.31", "1.32"] + k8s: ["1.30", "1.31", "1.32"] exclude: - k8s: "1.32" branch: "release-v3.12" diff --git a/.mergify.yml b/.mergify.yml index d56b532f049..960ad868800 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -52,15 +52,12 @@ queue_rules: - "status-success=mod-check" - "status-success=lint-extras" - "status-success=uncommitted-code-check" - - "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" @@ -122,15 +119,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.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" @@ -219,15 +213,12 @@ pull_request_rules: - "status-success=commitlint" - "status-success=mod-check" - "status-success=lint-extras" - - "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"