Skip to content

Commit c6533c9

Browse files
test(e2e): Add v1.30.5 test for Nutanix
Also change the default machine template image for nutanix to v1.30.5
1 parent 65a1844 commit c6533c9

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

.github/workflows/checks.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ jobs:
6464
strategy:
6565
matrix:
6666
config:
67-
- {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"}
67+
- {"provider": "Nutanix", "kubernetesVersion": "v1.29.6", "osImage": "nkp-rocky-9.4-release-1.29.6-20240816215147"}
68+
- {"provider": "Nutanix", "kubernetesVersion": "v1.30.5", "osImage": "nkp-rocky-9.4-release-1.30.5-20240930171619"}
6869
- {"provider": "Docker", "kubernetesVersion": "v1.29.8"}
69-
- {"provider": "Docker", "kubernetesVersion": "v1.30.4"}
70+
- {"provider": "Docker", "kubernetesVersion": "v1.30.5"}
7071
- {"provider": "Docker", "kubernetesVersion": "v1.31.0"}
7172
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
7273
# - {"provider": "AWS", "kubernetesVersion": "v1.29.6"}
@@ -77,6 +78,7 @@ jobs:
7778
provider: ${{ matrix.config.provider }}
7879
kubernetes-version: ${{ matrix.config.kubernetesVersion }}
7980
runs-on: ${{ matrix.config.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
81+
os-image: ${{ matrix.config.provider == 'Nutanix' && matrix.config.osImage || '' }}
8082
secrets: inherit
8183
permissions:
8284
contents: read

.github/workflows/e2e.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ on:
2222
description: The version of Kubernetes to test with
2323
type: string
2424
required: true
25+
os-image:
26+
description: The OS image to use for the machine template
27+
type: string
28+
required: false
2529

2630
jobs:
2731
e2e-test:
@@ -87,6 +91,7 @@ jobs:
8791
NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ${{ vars.NUTANIX_PRISM_ELEMENT_CLUSTER_NAME }}
8892
NUTANIX_SUBNET_NAME: ${{ vars.NUTANIX_SUBNET_NAME }}
8993
NUTANIX_STORAGE_CONTAINER_NAME: ${{ vars.NUTANIX_STORAGE_CONTAINER_NAME }}
94+
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: ${{ inputs.os-image }}
9095
KINDEST_IMAGE_TAG: ${{ inputs.kubernetes-version }}
9196
E2E_KUBERNETES_VERSION: ${{ inputs.kubernetes-version }}
9297

test/e2e/config/caren.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ variables:
201201
# # Name of the Prism Element cluster.
202202
# NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ""
203203
# # Name of the OS image pre-uploaded in PC.
204-
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.29.6-20240816215147
204+
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.30.5-20240930171619
205205
# # Name of the subnet to be assigned to the VMs.
206206
# NUTANIX_SUBNET_NAME: ""
207207
# # Name of the storage container to CSI driver

test/e2e/e2e_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func init() {
6969
flag.StringVar(
7070
&bootstrapKubernetesVersion,
7171
"e2e.bootstrap-kind-version",
72-
"v1.29.6",
72+
"v1.30.5",
7373
"the version of the image used in bootstrap cluster",
7474
)
7575
}

0 commit comments

Comments
 (0)