Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: fix multi-zone test failure on capz multi-zone cluster #2098

Merged
merged 2 commits into from
Nov 30, 2023
Merged

test: fix multi-zone test failure on capz multi-zone cluster #2098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11093e
test: fix multi-zone test failure on capz multi-zone cluster
andyzhangx Nov 29, 2023
5d13fc3
test: skip shared disk multi zone test on capz cluster
andyzhangx Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions test/e2e/dynamic_provisioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) {
},
}

if isMultiZone && !isUsingInTreeVolumePlugin {
if isMultiZone && !isUsingInTreeVolumePlugin && !isCapzTest {
test.StorageClassParameters = map[string]string{
"skuName": "UltraSSD_LRS",
"cachingmode": "None",
Expand All @@ -154,7 +154,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) {
pods := []testsuites.PodDetails{
{
Cmd: convertToPowershellorCmdCommandIfNecessary("echo 'hello world' > /mnt/test-1/data && grep 'hello world' /mnt/test-1/data"),
Volumes: []testsuites.VolumeDetails{
Volumes: t.normalizeVolumes([]testsuites.VolumeDetails{
{
ClaimSize: "10Gi",
VolumeMount: testsuites.VolumeMountDetails{
Expand All @@ -163,7 +163,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) {
},
VolumeAccessMode: v1.ReadWriteOnce,
},
},
}, isMultiZone),
IsWindows: isWindowsCluster,
WinServerVer: winServerVer,
},
Expand Down Expand Up @@ -1272,6 +1272,9 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) {
skipIfTestingInWindowsCluster()
if isMultiZone {
skipIfNotZRSSupported()
if isCapzTest {
ginkgo.Skip("skip shared disk multi zone test on capz cluster")
}
}

pod := testsuites.PodDetails{
Expand Down
1 change: 1 addition & 0 deletions test/e2e/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ var (
winServerVer = os.Getenv(testWinServerVerEnvVar)
isAzureStackCloud = strings.EqualFold(os.Getenv(cloudNameEnvVar), "AZURESTACKCLOUD")
isWindowsHPCDeployment = strings.EqualFold(os.Getenv("WINDOWS_USE_HOST_PROCESS_CONTAINERS"), "true")
isCapzTest = os.Getenv("NODE_MACHINE_TYPE") != ""
location string
supportsZRS bool
supportsDynamicResize bool
Expand Down
Loading