diff --git a/test/e2e/BUILD b/test/e2e/BUILD index bcba2f9de9d..6ca02b68e79 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -24,6 +24,7 @@ go_test( "//test/e2e/cluster-logging:go_default_library", "//test/e2e/extension:go_default_library", "//test/e2e/framework:go_default_library", + "//test/e2e/kubectl:go_default_library", "//test/e2e/metrics:go_default_library", "//test/e2e/scalability:go_default_library", "//test/e2e/scheduling:go_default_library", diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 8f19a3700ff..39a82e9037b 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -24,6 +24,7 @@ import ( _ "k8s.io/kubernetes/test/e2e/cluster-logging" _ "k8s.io/kubernetes/test/e2e/extension" "k8s.io/kubernetes/test/e2e/framework" + _ "k8s.io/kubernetes/test/e2e/kubectl" _ "k8s.io/kubernetes/test/e2e/scalability" _ "k8s.io/kubernetes/test/e2e/scheduling" _ "k8s.io/kubernetes/test/e2e/storage" diff --git a/test/e2e/kubectl/framework.go b/test/e2e/kubectl/framework.go index 9f216277da8..79e69f9e89c 100644 --- a/test/e2e/kubectl/framework.go +++ b/test/e2e/kubectl/framework.go @@ -16,8 +16,8 @@ limitations under the License. package kubectl -import "k8s.io/kubernetes/test/e2e/framework" +import "github.com/onsi/ginkgo" -func kubectlDescribe(text string, body func()) bool { - return framework.KubeDescribe("[sig-cli] "+text, body) +func SIGDescribe(text string, body func()) bool { + return ginkgo.Describe("[sig-cli] "+text, body) } diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index b75619f0a99..f0f0c668b9f 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -186,7 +186,7 @@ func runKubectlRetryOrDie(args ...string) string { } // duplicated setup to avoid polluting "normal" clients with alpha features which confuses the generated clients -var _ = kubectlDescribe("Kubectl alpha client", func() { +var _ = SIGDescribe("Kubectl alpha client", func() { defer GinkgoRecover() f := framework.NewDefaultFramework("kubectl") @@ -275,7 +275,7 @@ var _ = kubectlDescribe("Kubectl alpha client", func() { }) }) -var _ = kubectlDescribe("Kubectl client", func() { +var _ = SIGDescribe("Kubectl client", func() { defer GinkgoRecover() f := framework.NewDefaultFramework("kubectl") diff --git a/test/e2e/kubectl/portforward.go b/test/e2e/kubectl/portforward.go index 4ad07fdc250..9fb21d81792 100644 --- a/test/e2e/kubectl/portforward.go +++ b/test/e2e/kubectl/portforward.go @@ -471,7 +471,7 @@ func doTestOverWebSockets(bindAddress string, f *framework.Framework) { verifyLogMessage(logOutput, "^Received expected client data$") } -var _ = kubectlDescribe("Kubectl Port forwarding", func() { +var _ = SIGDescribe("Kubectl Port forwarding", func() { f := framework.NewDefaultFramework("port-forwarding") framework.KubeDescribe("With a server listening on 0.0.0.0", func() { diff --git a/test/e2e/kubectl/proxy.go b/test/e2e/kubectl/proxy.go index 1edcb8001b7..076c791a780 100644 --- a/test/e2e/kubectl/proxy.go +++ b/test/e2e/kubectl/proxy.go @@ -51,7 +51,7 @@ const ( proxyHTTPCallTimeout = 30 * time.Second ) -var _ = kubectlDescribe("Kubectl Proxy", func() { +var _ = SIGDescribe("Kubectl Proxy", func() { version := api.Registry.GroupOrDie(v1.GroupName).GroupVersion.Version Context("version "+version, func() { options := framework.FrameworkOptions{