diff --git a/test/e2e/ui/BUILD b/test/e2e/ui/BUILD index 67696dd9728..4a32387c9ee 100644 --- a/test/e2e/ui/BUILD +++ b/test/e2e/ui/BUILD @@ -15,6 +15,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/service:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", ], diff --git a/test/e2e/ui/dashboard.go b/test/e2e/ui/dashboard.go index 40a38e5dd7e..d0dd5270c84 100644 --- a/test/e2e/ui/dashboard.go +++ b/test/e2e/ui/dashboard.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" e2eservice "k8s.io/kubernetes/test/e2e/framework/service" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" testutils "k8s.io/kubernetes/test/utils" "github.com/onsi/ginkgo" @@ -35,7 +36,7 @@ import ( var _ = SIGDescribe("Kubernetes Dashboard [Feature:Dashboard]", func() { ginkgo.BeforeEach(func() { // TODO(kubernetes/kubernetes#61559): Enable dashboard here rather than skip the test. - framework.SkipIfProviderIs("gke") + e2eskipper.SkipIfProviderIs("gke") }) const ( diff --git a/test/e2e/upgrades/BUILD b/test/e2e/upgrades/BUILD index f3de920fc6f..3bece0cc2e4 100644 --- a/test/e2e/upgrades/BUILD +++ b/test/e2e/upgrades/BUILD @@ -41,6 +41,7 @@ go_library( "//test/e2e/framework/node:go_default_library", "//test/e2e/framework/security:go_default_library", "//test/e2e/framework/service:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/e2e/framework/statefulset:go_default_library", "//test/e2e/framework/testfiles:go_default_library", "//test/e2e/scheduling:go_default_library", diff --git a/test/e2e/upgrades/storage/BUILD b/test/e2e/upgrades/storage/BUILD index c3f727b0bfe..5122664834e 100644 --- a/test/e2e/upgrades/storage/BUILD +++ b/test/e2e/upgrades/storage/BUILD @@ -20,6 +20,7 @@ go_library( "//test/e2e/framework:go_default_library", "//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/pv:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/e2e/storage/utils:go_default_library", "//test/e2e/upgrades:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/upgrades/storage/persistent_volumes.go b/test/e2e/upgrades/storage/persistent_volumes.go index 443981a134c..0ebb721591a 100644 --- a/test/e2e/upgrades/storage/persistent_volumes.go +++ b/test/e2e/upgrades/storage/persistent_volumes.go @@ -22,6 +22,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epv "k8s.io/kubernetes/test/e2e/framework/pv" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/e2e/upgrades" "github.com/onsi/ginkgo" @@ -46,7 +47,7 @@ const ( func (t *PersistentVolumeUpgradeTest) Setup(f *framework.Framework) { var err error - framework.SkipUnlessProviderIs("gce", "gke", "openstack", "aws", "vsphere", "azure") + e2eskipper.SkipUnlessProviderIs("gce", "gke", "openstack", "aws", "vsphere", "azure") ns := f.Namespace.Name diff --git a/test/e2e/upgrades/sysctl.go b/test/e2e/upgrades/sysctl.go index c47ebf53543..0afaca23a65 100644 --- a/test/e2e/upgrades/sysctl.go +++ b/test/e2e/upgrades/sysctl.go @@ -28,6 +28,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/sysctl" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" imageutils "k8s.io/kubernetes/test/utils/image" ) @@ -87,7 +88,7 @@ func (t *SysctlUpgradeTest) verifySafeSysctlWork(f *framework.Framework) *v1.Pod ev, err := f.PodClient().WaitForErrorEventOrSuccess(t.validPod) framework.ExpectNoError(err) if ev != nil && ev.Reason == sysctl.UnsupportedReason { - framework.Skipf("No sysctl support in Docker <1.12") + e2eskipper.Skipf("No sysctl support in Docker <1.12") } f.TestContainerOutput("pod with safe sysctl launched", t.validPod, 0, []string{fmt.Sprintf("%s = %s", safeSysctl, safeSysctlValue)}) @@ -105,7 +106,7 @@ func (t *SysctlUpgradeTest) verifyUnsafeSysctlsAreRejected(f *framework.Framewor ev, err := f.PodClient().WaitForErrorEventOrSuccess(invalidPod) framework.ExpectNoError(err) if ev != nil && ev.Reason == sysctl.UnsupportedReason { - framework.Skipf("No sysctl support in Docker <1.12") + e2eskipper.Skipf("No sysctl support in Docker <1.12") } framework.ExpectEqual(ev.Reason, sysctl.ForbiddenReason)