diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD index 875febe9df1..4e3172771a3 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -51,6 +51,7 @@ go_library( "//test/e2e/framework/rc:go_default_library", "//test/e2e/framework/replicaset:go_default_library", "//test/e2e/framework/service:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/utils:go_default_library", "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/scheduling/nvidia-gpus.go b/test/e2e/scheduling/nvidia-gpus.go index 58c40856131..27d9a504728 100644 --- a/test/e2e/scheduling/nvidia-gpus.go +++ b/test/e2e/scheduling/nvidia-gpus.go @@ -32,6 +32,7 @@ import ( e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "k8s.io/kubernetes/test/e2e/framework/providers/gce" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" @@ -309,7 +310,7 @@ func podNames(pods []v1.Pod) []string { var _ = SIGDescribe("GPUDevicePluginAcrossRecreate [Feature:Recreate]", func() { ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") }) f := framework.NewDefaultFramework("device-plugin-gpus-recreate") ginkgo.It("run Nvidia GPU Device Plugin tests with a recreation", func() { diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index 0ff158edb7e..ffce11ba4c6 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -34,6 +34,7 @@ import ( e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2erc "k8s.io/kubernetes/test/e2e/framework/rc" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" k8utilnet "k8s.io/utils/net" @@ -120,7 +121,7 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() { // It is so because we need to have precise control on what's running in the cluster. ginkgo.It("validates local ephemeral storage resource limits of pods that are allowed to run [Feature:LocalStorageCapacityIsolation]", func() { - framework.SkipUnlessServerVersionGTE(localStorageVersion, f.ClientSet.Discovery()) + e2eskipper.SkipUnlessServerVersionGTE(localStorageVersion, f.ClientSet.Discovery()) nodeMaxAllocatable := int64(0) diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go index 363f8839b30..9668cde9fa0 100644 --- a/test/e2e/scheduling/priorities.go +++ b/test/e2e/scheduling/priorities.go @@ -41,6 +41,7 @@ import ( e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2erc "k8s.io/kubernetes/test/e2e/framework/rc" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" ) @@ -158,7 +159,7 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() { ginkgo.It("Pod should be scheduled to node that don't match the PodAntiAffinity terms", func() { - framework.SkipUnlessNodeCountIsAtLeast(2) + e2eskipper.SkipUnlessNodeCountIsAtLeast(2) ginkgo.By("Trying to launch a pod with a label to get a node which can launch it.") pod := runPausePod(f, pausePodConfig{ diff --git a/test/e2e/scheduling/ubernetes_lite.go b/test/e2e/scheduling/ubernetes_lite.go index 673db11f414..774b4d89846 100644 --- a/test/e2e/scheduling/ubernetes_lite.go +++ b/test/e2e/scheduling/ubernetes_lite.go @@ -31,6 +31,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2erc "k8s.io/kubernetes/test/e2e/framework/rc" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" ) @@ -41,14 +42,14 @@ var _ = SIGDescribe("Multi-AZ Clusters", func() { var err error image := framework.ServeHostnameImage ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke", "aws") + e2eskipper.SkipUnlessProviderIs("gce", "gke", "aws") if zoneCount <= 0 { zoneCount, err = getZoneCount(f.ClientSet) framework.ExpectNoError(err) } ginkgo.By(fmt.Sprintf("Checking for multi-zone cluster. Zone count = %d", zoneCount)) msg := fmt.Sprintf("Zone count is %d, only run for multi-zone clusters, skipping test", zoneCount) - framework.SkipUnlessAtLeast(zoneCount, 2, msg) + e2eskipper.SkipUnlessAtLeast(zoneCount, 2, msg) // TODO: SkipUnlessDefaultScheduler() // Non-default schedulers might not spread }) ginkgo.It("should spread the pods of a service across zones", func() { diff --git a/test/e2e/scheduling/ubernetes_lite_volumes.go b/test/e2e/scheduling/ubernetes_lite_volumes.go index 141ce8f1c22..533e7572ac2 100644 --- a/test/e2e/scheduling/ubernetes_lite_volumes.go +++ b/test/e2e/scheduling/ubernetes_lite_volumes.go @@ -31,6 +31,7 @@ import ( e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "k8s.io/kubernetes/test/e2e/framework/providers/gce" e2epv "k8s.io/kubernetes/test/e2e/framework/pv" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" ) var _ = SIGDescribe("Multi-AZ Cluster Volumes [sig-storage]", func() { @@ -39,14 +40,14 @@ var _ = SIGDescribe("Multi-AZ Cluster Volumes [sig-storage]", func() { var err error image := framework.ServeHostnameImage ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") if zoneCount <= 0 { zoneCount, err = getZoneCount(f.ClientSet) framework.ExpectNoError(err) } ginkgo.By(fmt.Sprintf("Checking for multi-zone cluster. Zone count = %d", zoneCount)) msg := fmt.Sprintf("Zone count is %d, only run for multi-zone clusters, skipping test", zoneCount) - framework.SkipUnlessAtLeast(zoneCount, 2, msg) + e2eskipper.SkipUnlessAtLeast(zoneCount, 2, msg) // TODO: SkipUnlessDefaultScheduler() // Non-default schedulers might not spread }) ginkgo.It("should schedule pods in the same zones as statically provisioned PVs", func() { diff --git a/test/e2e/servicecatalog/BUILD b/test/e2e/servicecatalog/BUILD index c722e5ff61a..369d66be924 100644 --- a/test/e2e/servicecatalog/BUILD +++ b/test/e2e/servicecatalog/BUILD @@ -17,6 +17,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", ], diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go index 9e672b80a60..dfbd4ad1b75 100644 --- a/test/e2e/servicecatalog/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" @@ -41,7 +42,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { ginkgo.BeforeEach(func() { // only run on gce for the time being til we find an easier way to update // the admission controllers used on the others - framework.SkipUnlessProviderIs("gce") + e2eskipper.SkipUnlessProviderIs("gce") podClient = f.PodClient() }) @@ -74,7 +75,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { _, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip) if apierrors.IsNotFound(err) { - framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") + e2eskipper.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") } framework.ExpectNoError(err) @@ -192,7 +193,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { _, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip) if apierrors.IsNotFound(err) { - framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") + e2eskipper.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") } framework.ExpectNoError(err)