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

test: add ZRS e2e test #845

Merged
merged 1 commit into from
May 14, 2021
Merged

test: add ZRS e2e test #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion test/e2e/dynamic_provisioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
}
Expand Down Expand Up @@ -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"}
}
Expand Down Expand Up @@ -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{
{
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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",
Expand Down