Skip to content

Commit 6aa4c7e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#87102 from tanjunchen/migrate-to-skipper-004
test/e2e/kubectl test/e2e_kubeadm:Use e2eskipper package
2 parents bb3f8c7 + 3d34a81 commit 6aa4c7e

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

‎test/e2e/kubectl/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ go_library(
4646
"//test/e2e/framework/kubectl:go_default_library",
4747
"//test/e2e/framework/pod:go_default_library",
4848
"//test/e2e/framework/service:go_default_library",
49+
"//test/e2e/framework/skipper:go_default_library",
4950
"//test/e2e/framework/testfiles:go_default_library",
5051
"//test/e2e/scheduling:go_default_library",
5152
"//test/integration/etcd:go_default_library",

‎test/e2e/kubectl/kubectl.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import (
7474
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
7575
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
7676
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
77+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
7778
"k8s.io/kubernetes/test/e2e/framework/testfiles"
7879
"k8s.io/kubernetes/test/e2e/scheduling"
7980
"k8s.io/kubernetes/test/integration/etcd"
@@ -234,7 +235,7 @@ var _ = SIGDescribe("Kubectl alpha client", func() {
234235
})
235236

236237
ginkgo.It("should create a CronJob", func() {
237-
framework.SkipIfMissingResource(f.DynamicClient, cronJobGroupVersionResourceAlpha, f.Namespace.Name)
238+
e2eskipper.SkipIfMissingResource(f.DynamicClient, cronJobGroupVersionResourceAlpha, f.Namespace.Name)
238239

239240
schedule := "*/5 * * * ?"
240241
framework.RunKubectlOrDie(ns, "run", cjName, "--restart=OnFailure", "--generator=cronjob/v2alpha1",
@@ -1832,7 +1833,7 @@ metadata:
18321833
})
18331834

18341835
ginkgo.It("should create a CronJob", func() {
1835-
framework.SkipIfMissingResource(f.DynamicClient, cronJobGroupVersionResourceBeta, f.Namespace.Name)
1836+
e2eskipper.SkipIfMissingResource(f.DynamicClient, cronJobGroupVersionResourceBeta, f.Namespace.Name)
18361837

18371838
schedule := "*/5 * * * ?"
18381839
framework.RunKubectlOrDie(ns, "run", cjName, "--restart=OnFailure", "--generator=cronjob/v1beta1",

‎test/e2e_kubeadm/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ go_test(
3535
"//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
3636
"//test/e2e/framework:go_default_library",
3737
"//test/e2e/framework/config:go_default_library",
38+
"//test/e2e/framework/skipper:go_default_library",
3839
"//vendor/github.com/onsi/ginkgo:go_default_library",
3940
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
4041
"//vendor/github.com/onsi/ginkgo/reporters:go_default_library",

‎test/e2e_kubeadm/dns_addon_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package kubeadm
1818

1919
import (
2020
"k8s.io/kubernetes/test/e2e/framework"
21+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
2122

2223
"github.com/onsi/ginkgo"
2324
"github.com/onsi/gomega"
@@ -77,7 +78,7 @@ var _ = Describe("DNS addon", func() {
7778
ginkgo.Context("kube-dns ServiceAccount", func() {
7879
ginkgo.It("should exist", func() {
7980
if dnsType != "kube-dns" {
80-
framework.Skipf("Skipping because DNS type is %s", dnsType)
81+
e2eskipper.Skipf("Skipping because DNS type is %s", dnsType)
8182
}
8283

8384
ExpectServiceAccount(f.ClientSet, kubeSystemNamespace, kubeDNSServiceAccountName)
@@ -87,7 +88,7 @@ var _ = Describe("DNS addon", func() {
8788
ginkgo.Context("kube-dns Deployment", func() {
8889
ginkgo.It("should exist and be properly configured", func() {
8990
if dnsType != "kube-dns" {
90-
framework.Skipf("Skipping because DNS type is %s", dnsType)
91+
e2eskipper.Skipf("Skipping because DNS type is %s", dnsType)
9192
}
9293

9394
d := GetDeployment(f.ClientSet, kubeSystemNamespace, kubeDNSDeploymentName)
@@ -101,15 +102,15 @@ var _ = Describe("DNS addon", func() {
101102
ginkgo.Context("CoreDNS ServiceAccount", func() {
102103
ginkgo.It("should exist", func() {
103104
if dnsType != "CoreDNS" {
104-
framework.Skipf("Skipping because DNS type is %s", dnsType)
105+
e2eskipper.Skipf("Skipping because DNS type is %s", dnsType)
105106
}
106107

107108
ExpectServiceAccount(f.ClientSet, kubeSystemNamespace, coreDNSServiceAccountName)
108109
})
109110

110111
ginkgo.It("should have related ClusterRole and ClusterRoleBinding", func() {
111112
if dnsType != "CoreDNS" {
112-
framework.Skipf("Skipping because DNS type is %s", dnsType)
113+
e2eskipper.Skipf("Skipping because DNS type is %s", dnsType)
113114
}
114115

115116
ExpectClusterRole(f.ClientSet, coreDNSRoleName)
@@ -120,7 +121,7 @@ var _ = Describe("DNS addon", func() {
120121
ginkgo.Context("CoreDNS ConfigMap", func() {
121122
ginkgo.It("should exist and be properly configured", func() {
122123
if dnsType != "CoreDNS" {
123-
framework.Skipf("Skipping because DNS type is %s", dnsType)
124+
e2eskipper.Skipf("Skipping because DNS type is %s", dnsType)
124125
}
125126

126127
cm := GetConfigMap(f.ClientSet, kubeSystemNamespace, coreDNSConfigMap)
@@ -132,7 +133,7 @@ var _ = Describe("DNS addon", func() {
132133
ginkgo.Context("CoreDNS Deployment", func() {
133134
ginkgo.It("should exist and be properly configured", func() {
134135
if dnsType != "CoreDNS" {
135-
framework.Skipf("Skipping because DNS type is %s", dnsType)
136+
e2eskipper.Skipf("Skipping because DNS type is %s", dnsType)
136137
}
137138

138139
d := GetDeployment(f.ClientSet, kubeSystemNamespace, coreDNSDeploymentName)

‎test/e2e_kubeadm/networking_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/kubernetes/test/e2e/framework"
25+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
2526

2627
"github.com/onsi/ginkgo"
2728
)
@@ -75,10 +76,10 @@ var _ = Describe("networking [setup-networking]", func() {
7576
ginkgo.Context("podSubnet", func() {
7677
ginkgo.It("should be properly configured if specified in kubeadm-config", func() {
7778
if dualStack {
78-
framework.Skipf("Skipping because cluster is dual-stack")
79+
e2eskipper.Skipf("Skipping because cluster is dual-stack")
7980
}
8081
if !podSubnetInKubeadmConfig {
81-
framework.Skipf("Skipping because podSubnet was not specified in kubeadm-config")
82+
e2eskipper.Skipf("Skipping because podSubnet was not specified in kubeadm-config")
8283
}
8384
cc := getClusterConfiguration(f.ClientSet)
8485
if _, ok := cc["networking"]; ok {
@@ -99,10 +100,10 @@ var _ = Describe("networking [setup-networking]", func() {
99100
ginkgo.Context("serviceSubnet", func() {
100101
ginkgo.It("should be properly configured if specified in kubeadm-config", func() {
101102
if dualStack {
102-
framework.Skipf("Skipping because cluster is dual-stack")
103+
e2eskipper.Skipf("Skipping because cluster is dual-stack")
103104
}
104105
if !serviceSubnetInKubeadmConfig {
105-
framework.Skipf("Skipping because serviceSubnet was not specified in kubeadm-config")
106+
e2eskipper.Skipf("Skipping because serviceSubnet was not specified in kubeadm-config")
106107
}
107108
cc := getClusterConfiguration(f.ClientSet)
108109
if _, ok := cc["networking"]; ok {
@@ -124,10 +125,10 @@ var _ = Describe("networking [setup-networking]", func() {
124125
ginkgo.Context("podSubnet", func() {
125126
ginkgo.It("should be properly configured if specified in kubeadm-config", func() {
126127
if !dualStack {
127-
framework.Skipf("Skipping because cluster is not dual-stack")
128+
e2eskipper.Skipf("Skipping because cluster is not dual-stack")
128129
}
129130
if !podSubnetInKubeadmConfig {
130-
framework.Skipf("Skipping because podSubnet was not specified in kubeadm-config")
131+
e2eskipper.Skipf("Skipping because podSubnet was not specified in kubeadm-config")
131132
}
132133
cc := getClusterConfiguration(f.ClientSet)
133134
if _, ok := cc["networking"]; ok {

0 commit comments

Comments
 (0)