Merge pull request #27871 from lukaszo/e2e_zones

Automatic merge from submit-queue

Skip multi-zone e2e tests unless provider is GCE, GKE or AWS

No need to fail the tests. If label is not present then it means that node is not in any zone.
Related issue: #27372
This commit is contained in:
k8s-merge-robot
2016-06-28 05:13:36 -07:00
committed by GitHub

View File

@@ -38,13 +38,13 @@ var _ = framework.KubeDescribe("Ubernetes Lite", func() {
var err error
image := "gcr.io/google_containers/serve_hostname:v1.4"
BeforeEach(func() {
framework.SkipUnlessProviderIs("gce", "gke", "aws")
if zoneCount <= 0 {
zoneCount, err = getZoneCount(f.Client)
Expect(err).NotTo(HaveOccurred())
}
By(fmt.Sprintf("Checking for multi-zone cluster. Zone count = %d", zoneCount))
framework.SkipUnlessAtLeast(zoneCount, 2, "Zone count is %d, only run for multi-zone clusters, skipping test")
framework.SkipUnlessProviderIs("gce", "gke", "aws")
// TODO: SkipUnlessDefaultScheduler() // Non-default schedulers might not spread
})
It("should spread the pods of a service across zones", func() {