Skip to content

Commit 5ec5244

Browse files
authored
Merge pull request #18154 from hakman/azure-larger-sku
azure: Use larger VM SKU by default in tests and update skips
2 parents a9f450d + 109f5ed commit 5ec5244

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

tests/e2e/kubetest2-kops/deployer/up.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
238238
}
239239
case "azure":
240240
// Use SKUs for which there is enough quota
241-
args = appendIfUnset(args, "--control-plane-size", "Standard_D4s_v3")
242-
args = appendIfUnset(args, "--node-size", "Standard_D2s_v3")
241+
args = appendIfUnset(args, "--control-plane-size", "Standard_D4als_v7")
242+
args = appendIfUnset(args, "--node-size", "Standard_D4als_v7")
243243
case "gce":
244244
if isArm {
245245
args = appendIfUnset(args, "--control-plane-size", "t2a-standard-2")

tests/e2e/pkg/tester/skip_regex.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ func (t *Tester) setSkipRegexFlag() error {
112112
// kOps does not yet deploy the full Azure cloud-controller-manager (only cloud-node-manager),
113113
// so the service controller for LoadBalancer provisioning is not available.
114114
skipRegex += "|should.not.disrupt.a.cloud.load-balancer"
115+
// Skipped upstream in azuredisk-csi-driver external E2E:
116+
// https://github.com/kubernetes-sigs/azuredisk-csi-driver/blob/master/test/external-e2e/run.sh
117+
skipRegex += "|should.resize.volume.when.PVC.is.edited.while.pod.is.using.it"
118+
skipRegex += "|should.provision.storage.with.any.volume.data.source"
119+
skipRegex += "|should.mount.multiple.PV.pointing.to.the.same.storage.on.the.same.node"
115120
}
116121

117122
if cluster.Spec.LegacyCloudProvider == "gce" {

0 commit comments

Comments
 (0)