diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 368bc4f8f6a..8feb4beb826 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -19,10 +19,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/client/clientset_generated/clientset:go_default_library", - "//test/e2e/api:go_default_library", + "//test/e2e/apimachinery:go_default_library", "//test/e2e/autoscaling:go_default_library", "//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", @@ -52,18 +51,15 @@ go_library( "cadvisor.go", "certificates.go", "cluster_upgrade.go", - "custom_resource_definition.go", "dashboard.go", "dns.go", "dns_common.go", "dns_configmap.go", "e2e.go", - "etcd_failure.go", "events.go", "example_cluster_dns.go", "examples.go", "firewall.go", - "garbage_collector.go", "generated_clientset.go", "gke_local_ssd.go", "gke_node_pools.go", @@ -76,7 +72,6 @@ go_library( "limit_range.go", "logging_soak.go", "monitoring.go", - "namespace.go", "network_partition.go", "network_policy.go", "networking.go", @@ -114,7 +109,6 @@ go_library( "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/cloudprovider/providers/gce:go_default_library", - "//pkg/controller:go_default_library", "//pkg/controller/endpoint:go_default_library", "//pkg/controller/node:go_default_library", "//pkg/kubelet/apis:go_default_library", @@ -134,7 +128,6 @@ go_library( "//test/e2e/metrics:go_default_library", "//test/e2e/upgrades:go_default_library", "//test/e2e/upgrades/apps:go_default_library", - "//test/e2e/workload:go_default_library", "//test/e2e_federation:go_default_library", "//test/images/net/nat:go_default_library", "//test/utils:go_default_library", @@ -156,9 +149,6 @@ go_library( "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/api/rbac/v1beta1:go_default_library", "//vendor/k8s.io/api/settings/v1alpha1:go_default_library", - "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", - "//vendor/k8s.io/apiextensions-apiserver/test/integration/testserver:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -166,7 +156,6 @@ go_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/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", @@ -203,12 +192,11 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//test/e2e/api:all-srcs", + "//test/e2e/apimachinery:all-srcs", "//test/e2e/autoscaling:all-srcs", "//test/e2e/chaosmonkey:all-srcs", "//test/e2e/cluster-logging:all-srcs", "//test/e2e/common:all-srcs", - "//test/e2e/extension:all-srcs", "//test/e2e/framework:all-srcs", "//test/e2e/generated:all-srcs", "//test/e2e/kubectl:all-srcs", diff --git a/test/e2e/api/BUILD b/test/e2e/api/BUILD deleted file mode 100644 index 420fe02c6b4..00000000000 --- a/test/e2e/api/BUILD +++ /dev/null @@ -1,37 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["table_conversion.go"], - tags = ["automanaged"], - deps = [ - "//pkg/printers:go_default_library", - "//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/apimachinery/pkg/api/errors:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD new file mode 100644 index 00000000000..c9c7e8a0070 --- /dev/null +++ b/test/e2e/apimachinery/BUILD @@ -0,0 +1,61 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "custom_resource_definition.go", + "etcd_failure.go", + "framework.go", + "garbage_collector.go", + "initializers.go", + "namespace.go", + "table_conversion.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api/v1/pod:go_default_library", + "//pkg/client/clientset_generated/clientset:go_default_library", + "//pkg/client/retry:go_default_library", + "//pkg/controller:go_default_library", + "//pkg/printers:go_default_library", + "//test/e2e/framework:go_default_library", + "//test/e2e/metrics:go_default_library", + "//test/e2e/workload:go_default_library", + "//test/utils:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/test/integration/testserver:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1: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/types:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/test/e2e/custom_resource_definition.go b/test/e2e/apimachinery/custom_resource_definition.go similarity index 95% rename from test/e2e/custom_resource_definition.go rename to test/e2e/apimachinery/custom_resource_definition.go index d2e95bcbc11..84f4e97137a 100644 --- a/test/e2e/custom_resource_definition.go +++ b/test/e2e/apimachinery/custom_resource_definition.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package apimachinery import ( "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" @@ -25,7 +25,7 @@ import ( . "github.com/onsi/ginkgo" ) -var _ = Describe("CustomResourceDefinition resources", func() { +var _ = SIGDescribe("CustomResourceDefinition resources", func() { f := framework.NewDefaultFramework("custom-resource-definition") diff --git a/test/e2e/etcd_failure.go b/test/e2e/apimachinery/etcd_failure.go similarity index 98% rename from test/e2e/etcd_failure.go rename to test/e2e/apimachinery/etcd_failure.go index e4ac860492e..26d856fcbaa 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/apimachinery/etcd_failure.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package apimachinery import ( "time" @@ -31,7 +31,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("Etcd failure [Disruptive]", func() { +var _ = SIGDescribe("Etcd failure [Disruptive]", func() { f := framework.NewDefaultFramework("etcd-failure") diff --git a/test/e2e/apimachinery/framework.go b/test/e2e/apimachinery/framework.go new file mode 100644 index 00000000000..232add4a2ad --- /dev/null +++ b/test/e2e/apimachinery/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 apimachinery + +import "github.com/onsi/ginkgo" + +func SIGDescribe(text string, body func()) bool { + return ginkgo.Describe("[sig-api-machinery] "+text, body) +} diff --git a/test/e2e/garbage_collector.go b/test/e2e/apimachinery/garbage_collector.go similarity index 99% rename from test/e2e/garbage_collector.go rename to test/e2e/apimachinery/garbage_collector.go index 9b2da511b7d..59d597c3fbd 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/apimachinery/garbage_collector.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package apimachinery import ( "fmt" @@ -208,7 +208,7 @@ func gatherMetrics(f *framework.Framework) { } } -var _ = framework.KubeDescribe("Garbage collector", func() { +var _ = SIGDescribe("Garbage collector", func() { f := framework.NewDefaultFramework("gc") It("should delete pods created by rc when not orphaning", func() { clientSet := f.ClientSet diff --git a/test/e2e/extension/initializers.go b/test/e2e/apimachinery/initializers.go similarity index 97% rename from test/e2e/extension/initializers.go rename to test/e2e/apimachinery/initializers.go index b92faaddd81..0790528eaa1 100644 --- a/test/e2e/extension/initializers.go +++ b/test/e2e/apimachinery/initializers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package extension +package apimachinery import ( "fmt" @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" ) -var _ = framework.KubeDescribe("Initializers", func() { +var _ = SIGDescribe("Initializers", func() { f := framework.NewDefaultFramework("initializers") // TODO: Add failure traps once we have JustAfterEach @@ -150,7 +150,7 @@ var _ = framework.KubeDescribe("Initializers", func() { ch := make(chan struct{}) go func() { defer close(ch) - _, err := c.Core().Pods(ns).Create(newPod(podName)) + _, err := c.Core().Pods(ns).Create(newInitPod(podName)) Expect(err).NotTo(HaveOccurred()) }() @@ -197,7 +197,7 @@ var _ = framework.KubeDescribe("Initializers", func() { // bypass initialization for mirror pods By("Creating a mirror pod that bypasses initialization") podName = "mirror-pod" - pod = newPod(podName) + pod = newInitPod(podName) pod.Annotations = map[string]string{ v1.MirrorPodAnnotationKey: "true", } @@ -210,14 +210,14 @@ var _ = framework.KubeDescribe("Initializers", func() { }) func newUninitializedPod(podName string) *v1.Pod { - pod := newPod(podName) + pod := newInitPod(podName) pod.Initializers = &metav1.Initializers{ Pending: []metav1.Initializer{{Name: "Test"}}, } return pod } -func newPod(podName string) *v1.Pod { +func newInitPod(podName string) *v1.Pod { containerName := fmt.Sprintf("%s-container", podName) port := 8080 pod := &v1.Pod{ diff --git a/test/e2e/namespace.go b/test/e2e/apimachinery/namespace.go similarity index 99% rename from test/e2e/namespace.go rename to test/e2e/apimachinery/namespace.go index 28eae9cb409..758aa056dc1 100644 --- a/test/e2e/namespace.go +++ b/test/e2e/apimachinery/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package apimachinery import ( "fmt" @@ -257,7 +257,7 @@ func ensureServicesAreRemovedWhenNamespaceIsDeleted(f *framework.Framework) { // that each have a variable amount of content in the associated Namespace. // When run in [Serial] this test appears to delete Namespace objects at a // rate of approximately 1 per second. -var _ = framework.KubeDescribe("Namespaces [Serial]", func() { +var _ = SIGDescribe("Namespaces [Serial]", func() { f := framework.NewDefaultFramework("namespaces") diff --git a/test/e2e/api/table_conversion.go b/test/e2e/apimachinery/table_conversion.go similarity index 94% rename from test/e2e/api/table_conversion.go rename to test/e2e/apimachinery/table_conversion.go index 2aa26b16380..21620c769eb 100644 --- a/test/e2e/api/table_conversion.go +++ b/test/e2e/apimachinery/table_conversion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package extension +package apimachinery import ( "bytes" @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" ) -var _ = framework.KubeDescribe("Servers with support for Table transformation", func() { +var _ = SIGDescribe("Servers with support for Table transformation", func() { f := framework.NewDefaultFramework("tables") It("should return pod details", func() { @@ -42,7 +42,7 @@ var _ = framework.KubeDescribe("Servers with support for Table transformation", podName := "pod-1" framework.Logf("Creating pod %s", podName) - _, err := c.Core().Pods(ns).Create(newPod(podName)) + _, err := c.Core().Pods(ns).Create(newTablePod(podName)) Expect(err).NotTo(HaveOccurred()) table := &metav1alpha1.Table{} @@ -99,7 +99,7 @@ func printTable(table *metav1alpha1.Table) string { return buf.String() } -func newPod(podName string) *v1.Pod { +func newTablePod(podName string) *v1.Pod { containerName := fmt.Sprintf("%s-container", podName) port := 8080 pod := &v1.Pod{ diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 39a82e9037b..e9069419055 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -19,10 +19,9 @@ package e2e import ( "testing" - _ "k8s.io/kubernetes/test/e2e/api" + _ "k8s.io/kubernetes/test/e2e/apimachinery" _ "k8s.io/kubernetes/test/e2e/autoscaling" _ "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" diff --git a/test/e2e/extension/BUILD b/test/e2e/extension/BUILD deleted file mode 100644 index 55cc152838a..00000000000 --- a/test/e2e/extension/BUILD +++ /dev/null @@ -1,39 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["initializers.go"], - tags = ["automanaged"], - deps = [ - "//pkg/client/clientset_generated/clientset:go_default_library", - "//pkg/client/retry:go_default_library", - "//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/admissionregistration/v1alpha1:go_default_library", - "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -)