From 0c4be047755055e84ab85ab724465688a5446cc7 Mon Sep 17 00:00:00 2001 From: Gavin Date: Mon, 4 Sep 2017 20:20:43 +0800 Subject: [PATCH] migration of federation test --- hack/.golint_failures | 1 + test/e2e/BUILD | 5 +-- test/e2e/e2e_test.go | 1 + test/e2e/multicluster/BUILD | 38 +++++++++++++++++++ test/e2e/multicluster/framework.go | 23 +++++++++++ test/e2e/{ => multicluster}/ubernetes_lite.go | 4 +- 6 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 test/e2e/multicluster/BUILD create mode 100644 test/e2e/multicluster/framework.go rename test/e2e/{ => multicluster}/ubernetes_lite.go (99%) diff --git a/hack/.golint_failures b/hack/.golint_failures index 4f5a61cac89..33c9c1c5497 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -815,6 +815,7 @@ test/e2e/instrumentation/monitoring test/e2e/kubectl test/e2e/lifecycle test/e2e/lifecycle/bootstrap +test/e2e/multicluster test/e2e/network test/e2e/node test/e2e/scalability diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 89363a386d9..10d66a2fc4c 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -21,6 +21,7 @@ go_test( "//test/e2e/kubectl:go_default_library", "//test/e2e/lifecycle:go_default_library", "//test/e2e/lifecycle/bootstrap:go_default_library", + "//test/e2e/multicluster:go_default_library", "//test/e2e/network:go_default_library", "//test/e2e/node:go_default_library", "//test/e2e/scalability:go_default_library", @@ -47,7 +48,6 @@ go_library( "pre_stop.go", "resource_quota.go", "ssh.go", - "ubernetes_lite.go", ], deps = [ "//pkg/api:go_default_library", @@ -57,7 +57,6 @@ go_library( "//pkg/cloudprovider/providers/gce:go_default_library", "//pkg/controller/node:go_default_library", "//pkg/kubectl/util/logs:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/quota/evaluator/core:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", @@ -83,7 +82,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime/schema: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", "//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", @@ -127,6 +125,7 @@ filegroup( "//test/e2e/kubectl:all-srcs", "//test/e2e/lifecycle:all-srcs", "//test/e2e/manifest:all-srcs", + "//test/e2e/multicluster:all-srcs", "//test/e2e/network:all-srcs", "//test/e2e/node:all-srcs", "//test/e2e/perftype:all-srcs", diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 2275110205a..234fde0851f 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -31,6 +31,7 @@ import ( _ "k8s.io/kubernetes/test/e2e/kubectl" _ "k8s.io/kubernetes/test/e2e/lifecycle" _ "k8s.io/kubernetes/test/e2e/lifecycle/bootstrap" + _ "k8s.io/kubernetes/test/e2e/multicluster" _ "k8s.io/kubernetes/test/e2e/network" _ "k8s.io/kubernetes/test/e2e/node" _ "k8s.io/kubernetes/test/e2e/scalability" diff --git a/test/e2e/multicluster/BUILD b/test/e2e/multicluster/BUILD new file mode 100644 index 00000000000..cb998d70f58 --- /dev/null +++ b/test/e2e/multicluster/BUILD @@ -0,0 +1,38 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = [ + "framework.go", + "ubernetes_lite.go", + ], + visibility = ["//visibility:public"], + deps = [ + "//pkg/kubelet/apis:go_default_library", + "//test/e2e/framework: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/core/v1: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/util/intstr:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/uuid: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/multicluster/framework.go b/test/e2e/multicluster/framework.go new file mode 100644 index 00000000000..15905403528 --- /dev/null +++ b/test/e2e/multicluster/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 multicluster + +import "github.com/onsi/ginkgo" + +func SIGDescribe(text string, body func()) bool { + return ginkgo.Describe("[sig-multicluster] "+text, body) +} diff --git a/test/e2e/ubernetes_lite.go b/test/e2e/multicluster/ubernetes_lite.go similarity index 99% rename from test/e2e/ubernetes_lite.go rename to test/e2e/multicluster/ubernetes_lite.go index d8958284907..2e6f5bce27d 100644 --- a/test/e2e/ubernetes_lite.go +++ b/test/e2e/multicluster/ubernetes_lite.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package multicluster import ( "fmt" @@ -34,7 +34,7 @@ import ( testutils "k8s.io/kubernetes/test/utils" ) -var _ = framework.KubeDescribe("Multi-AZ Clusters", func() { +var _ = SIGDescribe("Multi-AZ Clusters", func() { f := framework.NewDefaultFramework("multi-az") var zoneCount int var err error