From 0476fc58e1fee5bec442df86b18c6ed2f83e387f Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Mon, 24 Mar 2025 11:17:40 +0000 Subject: [PATCH] ci: Use Kubernetes minor in e2e check name This allows us to change patch versions without having to update required checks. We will need to update reuired checks prior to merging this PR and rebase any inflight PRs. --- .github/workflows/checks.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 76895ffa1..5fa4dd64f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -64,15 +64,15 @@ jobs: strategy: matrix: config: - - {"provider": "Nutanix", "kubernetesVersion": "v1.30.5", "osImage": "nkp-rocky-9.5-release-1.30.5-20241204003513"} - - {"provider": "Nutanix", "kubernetesVersion": "v1.31.4", "osImage": "nkp-rocky-9.5-release-1.31.4-20250205191544"} - - {"provider": "Docker", "kubernetesVersion": "v1.30.10"} - - {"provider": "Docker", "kubernetesVersion": "v1.31.6"} - - {"provider": "Docker", "kubernetesVersion": "v1.32.2"} + - {"provider": "Nutanix", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.5", "osImage": "nkp-rocky-9.5-release-1.30.5-20241204003513"} + - {"provider": "Nutanix", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.4", "osImage": "nkp-rocky-9.5-release-1.31.4-20250205191544"} + - {"provider": "Docker", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.11"} + - {"provider": "Docker", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.7"} + - {"provider": "Docker", "kubernetesMinor": "v1.32", "kubernetesVersion": "v1.32.3"} # Uncomment below once we have the ability to run e2e tests on other providers from GHA. - # - {"provider": "AWS", "kubernetesVersion": "v1.29.6"} + # - {"provider": "AWS", "kubernetesMinor": "v1.29", "kubernetesVersion": "v1.29.6"} fail-fast: false - name: e2e-quick-start (${{ matrix.config.provider }}, ${{ matrix.config.kubernetesVersion }}) + name: e2e-quick-start (${{ matrix.config.provider }} provider, Kubernetes ${{ matrix.config.kubernetesMinor }}) uses: ./.github/workflows/e2e.yml with: focus: Quick start @@ -95,13 +95,14 @@ jobs: strategy: matrix: config: - - {"provider": "Docker", "kubernetesVersion": "v1.30.10"} - - {"provider": "Docker", "kubernetesVersion": "v1.31.6"} - - {"provider": "Docker", "kubernetesVersion": "v1.32.2"} + - {"provider": "Docker", "kubernetesMinor": "v1.30", "kubernetesVersion": "v1.30.11"} + - {"provider": "Docker", "kubernetesMinor": "v1.31", "kubernetesVersion": "v1.31.7"} + - {"provider": "Docker", "kubernetesMinor": "v1.32", "kubernetesVersion": "v1.32.3"} # Uncomment below once we have the ability to run e2e tests on other providers from GHA. - # - {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"} - # - {"provider": "AWS", "kubernetesVersion": "v1.29.6"} + # - {"provider": "Nutanix", "kubernetesMinor": "v1.29", "kubernetesVersion": "v1.29.6"} + # - {"provider": "AWS", "kubernetesMinor": "v1.29", "kubernetesVersion": "v1.29.6"} fail-fast: false + name: e2e-self-hosted (${{ matrix.config.provider }} provider, Kubernetes ${{ matrix.config.kubernetesMinor }}) uses: ./.github/workflows/e2e.yml with: focus: Self-hosted