From e98f4f3ef89e68b72eba87d3121c02786d549aaf Mon Sep 17 00:00:00 2001
From: YuikoTakada <y-mori@ti.jp.nec.com>
Date: Fri, 17 Jan 2020 08:41:35 +0000
Subject: [PATCH] Use e2eskipper package in test/e2e/framework/

---
 test/e2e/framework/network/BUILD                  | 1 +
 test/e2e/framework/network/utils.go               | 3 ++-
 test/e2e/framework/providers/gce/BUILD            | 1 +
 test/e2e/framework/providers/gce/recreate_node.go | 3 ++-
 test/e2e/framework/pv/BUILD                       | 1 +
 test/e2e/framework/pv/pv.go                       | 3 ++-
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/e2e/framework/network/BUILD b/test/e2e/framework/network/BUILD
index 19f8f325f29..e6ad7cd95d6 100644
--- a/test/e2e/framework/network/BUILD
+++ b/test/e2e/framework/network/BUILD
@@ -19,6 +19,7 @@ go_library(
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/node:go_default_library",
         "//test/e2e/framework/pod: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/framework/network/utils.go b/test/e2e/framework/network/utils.go
index 003626c7531..b09d78973fd 100644
--- a/test/e2e/framework/network/utils.go
+++ b/test/e2e/framework/network/utils.go
@@ -40,6 +40,7 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
+	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
@@ -619,7 +620,7 @@ func (config *NetworkingTestConfig) setup(selector map[string]string) {
 	framework.ExpectNoError(err)
 	config.ExternalAddr = e2enode.FirstAddress(nodeList, v1.NodeExternalIP)
 
-	framework.SkipUnlessNodeCountIsAtLeast(2)
+	e2eskipper.SkipUnlessNodeCountIsAtLeast(2)
 	config.Nodes = nodeList.Items
 
 	ginkgo.By("Creating the service on top of the pods in kubernetes")
diff --git a/test/e2e/framework/providers/gce/BUILD b/test/e2e/framework/providers/gce/BUILD
index f94a532489f..a1125c15b07 100644
--- a/test/e2e/framework/providers/gce/BUILD
+++ b/test/e2e/framework/providers/gce/BUILD
@@ -27,6 +27,7 @@ go_library(
         "//test/e2e/framework/pod:go_default_library",
         "//test/e2e/framework/pv: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",
         "//vendor/google.golang.org/api/compute/v1:go_default_library",
diff --git a/test/e2e/framework/providers/gce/recreate_node.go b/test/e2e/framework/providers/gce/recreate_node.go
index 362663b76a7..1a57b0a504e 100644
--- a/test/e2e/framework/providers/gce/recreate_node.go
+++ b/test/e2e/framework/providers/gce/recreate_node.go
@@ -29,6 +29,7 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
+	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 	testutils "k8s.io/kubernetes/test/utils"
 )
 
@@ -47,7 +48,7 @@ var _ = ginkgo.Describe("Recreate [Feature:Recreate]", func() {
 	var ps *testutils.PodStore
 	systemNamespace := metav1.NamespaceSystem
 	ginkgo.BeforeEach(func() {
-		framework.SkipUnlessProviderIs("gce", "gke")
+		e2eskipper.SkipUnlessProviderIs("gce", "gke")
 		var err error
 		numNodes, err := e2enode.TotalRegistered(f.ClientSet)
 		framework.ExpectNoError(err)
diff --git a/test/e2e/framework/pv/BUILD b/test/e2e/framework/pv/BUILD
index 85df744deb7..74089a42c69 100644
--- a/test/e2e/framework/pv/BUILD
+++ b/test/e2e/framework/pv/BUILD
@@ -16,6 +16,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/types: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",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
     ],
 )
diff --git a/test/e2e/framework/pv/pv.go b/test/e2e/framework/pv/pv.go
index 5170b9c4de3..cc8578f07ad 100644
--- a/test/e2e/framework/pv/pv.go
+++ b/test/e2e/framework/pv/pv.go
@@ -31,6 +31,7 @@ import (
 	storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/kubernetes/test/e2e/framework"
+	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 )
 
 const (
@@ -795,6 +796,6 @@ func GetDefaultStorageClassName(c clientset.Interface) (string, error) {
 func SkipIfNoDefaultStorageClass(c clientset.Interface) {
 	_, err := GetDefaultStorageClassName(c)
 	if err != nil {
-		framework.Skipf("error finding default storageClass : %v", err)
+		e2eskipper.Skipf("error finding default storageClass : %v", err)
 	}
 }