diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go index e4394bfa68..6d18fa44fe 100644 --- a/test/e2e/dynamic_provisioning_test.go +++ b/test/e2e/dynamic_provisioning_test.go @@ -167,6 +167,9 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) { Pods: pods, StorageClassParameters: map[string]string{"skuName": "StandardSSD_LRS"}, } + if !isUsingInTreeVolumePlugin && (location == "westus2" || location == "westeurope") { + test.StorageClassParameters = map[string]string{"skuName": "StandardSSD_ZRS"} + } if isAzureStackCloud { test.StorageClassParameters = map[string]string{"skuName": "Standard_LRS"} } @@ -223,6 +226,9 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) { Pods: pods, StorageClassParameters: map[string]string{"skuName": "StandardSSD_LRS"}, } + if !isUsingInTreeVolumePlugin && (location == "westus2" || location == "westeurope") { + test.StorageClassParameters = map[string]string{"skuName": "Premium_ZRS"} + } if isAzureStackCloud { test.StorageClassParameters = map[string]string{"skuName": "Standard_LRS"} } @@ -636,7 +642,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) { test.Run(cs, ns) }) - ginkgo.It("should create a volume azuredisk with tag [disk.csi.azure.com] [Windows]", func() { + ginkgo.It("should create a volume azuredisk with tag [disk.csi.azure.com] [Windows]", func() { skipIfUsingInTreeVolumePlugin() pods := []testsuites.PodDetails{ { diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index 629ca45436..7aeeb0991f 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -56,6 +56,7 @@ var ( isTestingMigration = os.Getenv(testMigrationEnvVar) != "" isWindowsCluster = os.Getenv(testWindowsEnvVar) != "" isAzureStackCloud = strings.EqualFold(os.Getenv(cloudNameEnvVar), "AZURESTACKCLOUD") + location string ) type testCmd struct { @@ -85,6 +86,8 @@ var _ = ginkgo.BeforeSuite(func() { _, err = azureClient.EnsureResourceGroup(context.Background(), creds.ResourceGroup, creds.Location, nil) gomega.Expect(err).NotTo(gomega.HaveOccurred()) + location = creds.Location + // Install Azure Disk CSI Driver on cluster from project root e2eBootstrap := testCmd{ command: "make",