Merge pull request #845 from andyzhangx/zrs-test

test: add ZRS e2e test
kubernetes-sigs · May 14, 2021 · 6456c0a · 6456c0a
2 parents 418aaf9 + a4ab9c6
commit 6456c0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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",