Use e2eskipper package in test/e2e/framework/

This commit is contained in:
YuikoTakada
2020-01-17 08:41:35 +00:00
parent 5d1c301610
commit e98f4f3ef8
6 changed files with 9 additions and 3 deletions

View File

@@ -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",

View File

@@ -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)