From fc453826c781d2f39d8487bf08f86d7bbc7cb409 Mon Sep 17 00:00:00 2001 From: Gavin Date: Wed, 16 Aug 2017 12:34:56 +0800 Subject: [PATCH] move some e2e tests to SIG respectively fix typo include the servicecatalog package add framework file update golint failures --- hack/.golint_failures | 1 + test/e2e/BUILD | 7 ++-- test/e2e/apimachinery/BUILD | 4 +++ .../{ => apimachinery}/generated_clientset.go | 8 ++--- test/e2e/e2e_test.go | 1 + test/e2e/servicecatalog/BUILD | 35 +++++++++++++++++++ test/e2e/servicecatalog/framework.go | 23 ++++++++++++ test/e2e/{ => servicecatalog}/podpreset.go | 4 +-- 8 files changed, 72 insertions(+), 11 deletions(-) rename test/e2e/{ => apimachinery}/generated_clientset.go (97%) create mode 100644 test/e2e/servicecatalog/BUILD create mode 100644 test/e2e/servicecatalog/framework.go rename test/e2e/{ => servicecatalog}/podpreset.go (99%) diff --git a/hack/.golint_failures b/hack/.golint_failures index d6e06a7d239..852d074ae14 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -816,6 +816,7 @@ test/e2e/network test/e2e/node test/e2e/scalability test/e2e/scheduling +test/e2e/servicecatalog test/e2e/storage test/e2e/upgrades test/e2e/upgrades/apps diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 9cf0abb35c9..8b427454981 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -28,6 +28,7 @@ go_test( "//test/e2e/node:go_default_library", "//test/e2e/scalability:go_default_library", "//test/e2e/scheduling:go_default_library", + "//test/e2e/servicecatalog:go_default_library", "//test/e2e/storage:go_default_library", "//test/utils:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", @@ -50,13 +51,11 @@ go_library( "events.go", "example_cluster_dns.go", "examples.go", - "generated_clientset.go", "gke_local_ssd.go", "gke_node_pools.go", "limit_range.go", "network_partition.go", "pod_gc.go", - "podpreset.go", "pods.go", "pre_stop.go", "resource_quota.go", @@ -86,11 +85,8 @@ go_library( "//vendor/github.com/onsi/ginkgo/config:go_default_library", "//vendor/github.com/onsi/ginkgo/reporters:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", - "//vendor/k8s.io/api/batch/v1:go_default_library", - "//vendor/k8s.io/api/batch/v2alpha1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/rbac/v1beta1:go_default_library", - "//vendor/k8s.io/api/settings/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", @@ -148,6 +144,7 @@ filegroup( "//test/e2e/perftype:all-srcs", "//test/e2e/scalability:all-srcs", "//test/e2e/scheduling:all-srcs", + "//test/e2e/servicecatalog:all-srcs", "//test/e2e/storage:all-srcs", "//test/e2e/testing-manifests:all-srcs", "//test/e2e/upgrades:all-srcs", diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index bc0d46ba4d0..f4c0a40a103 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -12,6 +12,7 @@ go_library( "etcd_failure.go", "framework.go", "garbage_collector.go", + "generated_clientset.go", "initializers.go", "namespace.go", "table_conversion.go", @@ -40,10 +41,13 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/names:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/util/retry:go_default_library", diff --git a/test/e2e/generated_clientset.go b/test/e2e/apimachinery/generated_clientset.go similarity index 97% rename from test/e2e/generated_clientset.go rename to test/e2e/apimachinery/generated_clientset.go index 4219da8377e..f5ac6b42db1 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/apimachinery/generated_clientset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package apimachinery import ( "strconv" @@ -148,7 +148,7 @@ func observerUpdate(w watch.Interface, expectedUpdate func(runtime.Object) bool) return } -var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() { +var _ = SIGDescribe("Generated release_1_5 clientset", func() { f := framework.NewDefaultFramework("clientset") It("should create pods, set the deletionTimestamp and deletionGracePeriodSeconds of the pod", func() { podClient := f.ClientSet.Core().Pods(f.Namespace.Name) @@ -260,7 +260,7 @@ func newTestingCronJob(name string, value string) *batchv2alpha1.CronJob { } } -var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() { +var _ = SIGDescribe("Generated release_1_5 clientset", func() { f := framework.NewDefaultFramework("clientset") It("should create v2alpha1 cronJobs, delete cronJobs, watch cronJobs", func() { var enabled bool @@ -338,7 +338,7 @@ var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() { }) }) -var _ = framework.KubeDescribe("Staging client repo client", func() { +var _ = SIGDescribe("Staging client repo client", func() { f := framework.NewDefaultFramework("clientset") It("should create pods, delete pods, watch pods", func() { podClient := f.StagingClient.CoreV1().Pods(f.Namespace.Name) diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index b38436e639e..2275110205a 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -35,6 +35,7 @@ import ( _ "k8s.io/kubernetes/test/e2e/node" _ "k8s.io/kubernetes/test/e2e/scalability" _ "k8s.io/kubernetes/test/e2e/scheduling" + _ "k8s.io/kubernetes/test/e2e/servicecatalog" _ "k8s.io/kubernetes/test/e2e/storage" ) diff --git a/test/e2e/servicecatalog/BUILD b/test/e2e/servicecatalog/BUILD new file mode 100644 index 00000000000..ffd1bd86bc9 --- /dev/null +++ b/test/e2e/servicecatalog/BUILD @@ -0,0 +1,35 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = [ + "framework.go", + "podpreset.go", + ], + visibility = ["//visibility:public"], + deps = [ + "//test/e2e/framework:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/api/settings/v1alpha1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", + "//vendor/k8s.io/client-go/kubernetes:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/test/e2e/servicecatalog/framework.go b/test/e2e/servicecatalog/framework.go new file mode 100644 index 00000000000..9b6dc4b1ab2 --- /dev/null +++ b/test/e2e/servicecatalog/framework.go @@ -0,0 +1,23 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package servicecatalog + +import "github.com/onsi/ginkgo" + +func SIGDescribe(text string, body func()) bool { + return ginkgo.Describe("[sig-service-catalog] "+text, body) +} diff --git a/test/e2e/podpreset.go b/test/e2e/servicecatalog/podpreset.go similarity index 99% rename from test/e2e/podpreset.go rename to test/e2e/servicecatalog/podpreset.go index e1fd0893ceb..a94c7715298 100644 --- a/test/e2e/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package servicecatalog import ( "reflect" @@ -33,7 +33,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("PodPreset", func() { +var _ = SIGDescribe("PodPreset", func() { f := framework.NewDefaultFramework("podpreset") var podClient *framework.PodClient