From 060ff8ebe8dc04bc9817451422d8c68dba9199b0 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Wed, 23 Nov 2016 10:00:37 -0800 Subject: [PATCH] Skip StatefulSet e2e tests if this resource is not found --- test/e2e/network_partition.go | 1 + test/e2e/petset.go | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/e2e/network_partition.go b/test/e2e/network_partition.go index cc41115c6025..53d3ac10d0cd 100644 --- a/test/e2e/network_partition.go +++ b/test/e2e/network_partition.go @@ -367,6 +367,7 @@ var _ = framework.KubeDescribe("Network Partition [Disruptive] [Slow]", func() { BeforeEach(func() { framework.SkipUnlessProviderIs("gce", "gke") + framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name) By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name) headlessService := createServiceSpec(headlessSvcName, "", true, labels) _, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService) diff --git a/test/e2e/petset.go b/test/e2e/petset.go index 3b0e93d7dec9..ad2a47ee40ca 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -64,6 +64,10 @@ const ( readTimeout = 60 * time.Second ) +var ( + StatefulSetGroupVersionResource = unversioned.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"} +) + // Time: 25m, slow by design. // GCE Quota requirements: 3 pds, one per pet manifest declared above. // GCE Api requirements: nodes and master need storage r/w permissions. @@ -75,6 +79,7 @@ var _ = framework.KubeDescribe("StatefulSet [Slow]", func() { BeforeEach(func() { c = f.ClientSet ns = f.Namespace.Name + framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name) }) framework.KubeDescribe("Basic StatefulSet functionality", func() { @@ -402,7 +407,7 @@ var _ = framework.KubeDescribe("Stateful Set recreate [Slow]", func() { petPodName := "web-0" BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "vagrant") + framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name) By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name) headlessService := createServiceSpec(headlessSvcName, "", true, labels) _, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService)