Merge pull request #2098 from andyzhangx/fix-multi-az-test

test: fix multi-zone test failure on capz multi-zone cluster
kubernetes-sigs · Nov 30, 2023 · 13c3ff8 · 13c3ff8
2 parents 19cc77f + 5d13fc3
commit 13c3ff8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go
@@ -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",
@@ -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{
@@ -163,7 +163,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) {
 						},
 						VolumeAccessMode: v1.ReadWriteOnce,
 					},
-				},
+				}, isMultiZone),
 				IsWindows:    isWindowsCluster,
 				WinServerVer: winServerVer,
 			},
@@ -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{

diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -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