Merge pull request #97432 from saikat-royc/skip-multiaz-volume-test

Skip multi az PD storage test if no extra zone detected
This commit is contained in:
Kubernetes Prow Robot 2020-12-23 12:00:38 -08:00 committed by GitHub
commit 47c2983490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -61,7 +61,7 @@ var _ = SIGDescribe("Multi-AZ Cluster Volumes [sig-storage]", func() {
})
})
// OnlyAllowNodeZones tests that GetAllCurrentZones returns only zones with Nodes
// OnlyAllowNodeZones tests that PDs are only provisioned in zones with nodes.
func OnlyAllowNodeZones(f *framework.Framework, zoneCount int, image string) {
gceCloud, err := gce.GetGCECloud()
framework.ExpectNoError(err)
@ -83,7 +83,10 @@ func OnlyAllowNodeZones(f *framework.Framework, zoneCount int, image string) {
break
}
}
framework.ExpectNotEqual(extraZone, "", fmt.Sprintf("No extra zones available in region %s", region))
if extraZone == "" {
e2eskipper.Skipf("All zones in region %s have compute instances, no extra zones available", region)
}
ginkgo.By(fmt.Sprintf("starting a compute instance in unused zone: %v\n", extraZone))
project := framework.TestContext.CloudConfig.ProjectID