From 7ecf404fc64521615953679576f3c554dd2fad45 Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Wed, 24 Jan 2018 01:13:21 +0000 Subject: [PATCH] Move multizone e2e to sig scheduling path --- hack/.golint_failures | 1 - test/e2e/BUILD | 2 - test/e2e/e2e_test.go | 1 - test/e2e/multicluster/BUILD | 42 ------------------- test/e2e/multicluster/framework.go | 23 ---------- test/e2e/scheduling/BUILD | 4 ++ .../ubernetes_lite.go | 2 +- .../ubernetes_lite_volumes.go | 4 +- 8 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 test/e2e/multicluster/BUILD delete mode 100644 test/e2e/multicluster/framework.go rename test/e2e/{multicluster => scheduling}/ubernetes_lite.go (99%) rename test/e2e/{multicluster => scheduling}/ubernetes_lite_volumes.go (99%) diff --git a/hack/.golint_failures b/hack/.golint_failures index fecea678a2e..6d5f831bed9 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -788,7 +788,6 @@ 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 88af77029ab..d85fe496a64 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -23,7 +23,6 @@ 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", @@ -109,7 +108,6 @@ 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 6cf3f2e085e..42a79107327 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -31,7 +31,6 @@ 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 deleted file mode 100644 index 2d4b21e4e02..00000000000 --- a/test/e2e/multicluster/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "framework.go", - "ubernetes_lite.go", - "ubernetes_lite_volumes.go", - ], - importpath = "k8s.io/kubernetes/test/e2e/multicluster", - 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/google.golang.org/api/compute/v1:go_default_library", - "//vendor/k8s.io/api/core/v1: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/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 deleted file mode 100644 index 15905403528..00000000000 --- a/test/e2e/multicluster/framework.go +++ /dev/null @@ -1,23 +0,0 @@ -/* -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/scheduling/BUILD b/test/e2e/scheduling/BUILD index 0a9d9bffa51..ba9a6dfbbcc 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -13,6 +13,8 @@ go_library( "priorities.go", "rescheduler.go", "resource_quota.go", + "ubernetes_lite.go", + "ubernetes_lite_volumes.go", ], importpath = "k8s.io/kubernetes/test/e2e/scheduling", visibility = ["//visibility:public"], @@ -20,6 +22,7 @@ go_library( "//pkg/api/v1/pod:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/kubelet/apis:go_default_library", "//pkg/quota/evaluator/core:go_default_library", "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/util/version:go_default_library", @@ -30,6 +33,7 @@ go_library( "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/google.golang.org/api/compute/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/api/scheduling/v1alpha1:go_default_library", diff --git a/test/e2e/multicluster/ubernetes_lite.go b/test/e2e/scheduling/ubernetes_lite.go similarity index 99% rename from test/e2e/multicluster/ubernetes_lite.go rename to test/e2e/scheduling/ubernetes_lite.go index efc4d83bc56..bae5351a51c 100644 --- a/test/e2e/multicluster/ubernetes_lite.go +++ b/test/e2e/scheduling/ubernetes_lite.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package multicluster +package scheduling import ( "fmt" diff --git a/test/e2e/multicluster/ubernetes_lite_volumes.go b/test/e2e/scheduling/ubernetes_lite_volumes.go similarity index 99% rename from test/e2e/multicluster/ubernetes_lite_volumes.go rename to test/e2e/scheduling/ubernetes_lite_volumes.go index 77cc8ac772c..cfdd755738f 100644 --- a/test/e2e/multicluster/ubernetes_lite_volumes.go +++ b/test/e2e/scheduling/ubernetes_lite_volumes.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package multicluster +package scheduling import ( "fmt" @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" ) -var _ = Describe("[sig-storage] Multi-AZ Clusters", func() { +var _ = SIGDescribe("Multi-AZ Cluster Volumes", func() { f := framework.NewDefaultFramework("multi-az") var zoneCount int var err error