github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

e2e/gke_local_ssd.go and e2e/gke_node_pools.go:Use e2eskipper package

Browse Source 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
This commit is contained in:
yuxiaobo 2020-01-13 11:22:45 +08:00
parent 36e40fb850
commit 34359176aa
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/BUILD
View File

@ -81,6 +81,7 @@ go_library(
"//test/e2e/framework/providers/kubemark:go_default_library", "//test/e2e/framework/providers/kubemark:go_default_library",
"//test/e2e/framework/providers/openstack:go_default_library", "//test/e2e/framework/providers/openstack:go_default_library",
"//test/e2e/framework/providers/vsphere: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/framework/testfiles:go_default_library",
"//test/e2e/manifest:go_default_library", "//test/e2e/manifest:go_default_library",
"//test/e2e/reporters:go_default_library", "//test/e2e/reporters:go_default_library",

3
test/e2e/gke_local_ssd.go
View File

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

3
test/e2e/gke_node_pools.go
View File

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