Merge pull request #87121 from yuxiaobo96/k8s-skipper

e2e/gke_local_ssd.go and e2e/gke_node_pools.go:Use e2eskipper package
This commit is contained in:
Kubernetes Prow Robot 2020-01-14 17:22:13 -08:00 committed by GitHub
commit 821d0e8580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

View File

@ -81,6 +81,7 @@ go_library(
"//test/e2e/framework/providers/kubemark:go_default_library",
"//test/e2e/framework/providers/openstack:go_default_library",
"//test/e2e/framework/providers/vsphere:go_default_library",
"//test/e2e/framework/skipper:go_default_library",
"//test/e2e/framework/testfiles:go_default_library",
"//test/e2e/manifest:go_default_library",
"//test/e2e/reporters:go_default_library",

View File

@ -24,6 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/kubernetes/test/e2e/framework"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"github.com/onsi/ginkgo"
)
@ -33,7 +34,7 @@ var _ = framework.KubeDescribe("GKE local SSD [Feature:GKELocalSSD]", func() {
f := framework.NewDefaultFramework("localssd")
ginkgo.BeforeEach(func() {
framework.SkipUnlessProviderIs("gke")
e2eskipper.SkipUnlessProviderIs("gke")
})
ginkgo.It("should write and read from node local SSD [Feature:GKELocalSSD]", func() {

View File

@ -22,6 +22,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
"github.com/onsi/ginkgo"
)
@ -31,7 +32,7 @@ var _ = framework.KubeDescribe("GKE node pools [Feature:GKENodePool]", func() {
f := framework.NewDefaultFramework("node-pools")
ginkgo.BeforeEach(func() {
framework.SkipUnlessProviderIs("gke")
e2eskipper.SkipUnlessProviderIs("gke")
})
ginkgo.It("should create a cluster with multiple node pools [Feature:GKENodePool]", func() {