From 411cbd03e90e320542ea18367736c30904b481f7 Mon Sep 17 00:00:00 2001
From: Gavin
Date: Wed, 9 Aug 2017 17:25:50 +0800
Subject: [PATCH] Move taints e2e test to sig-scheduling
delete taints_test file
update BUILD
fix confict
---
test/e2e/BUILD | 15 +--------------
test/e2e/scheduling/BUILD | 21 +++++++++++++++++++++
test/e2e/{ => scheduling}/taints_test.go | 4 ++--
3 files changed, 24 insertions(+), 16 deletions(-)
rename test/e2e/{ => scheduling}/taints_test.go (99%)
diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index 9cf0abb35c9..365c6597444 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -8,10 +8,7 @@ load(
go_test(
name = "go_default_test",
- srcs = [
- "e2e_test.go",
- "taints_test.go",
- ],
+ srcs = ["e2e_test.go"],
library = ":go_default_library",
deps = [
"//test/e2e/apimachinery:go_default_library",
@@ -29,16 +26,6 @@ go_test(
"//test/e2e/scalability:go_default_library",
"//test/e2e/scheduling:go_default_library",
"//test/e2e/storage:go_default_library",
- "//test/utils:go_default_library",
- "//vendor/github.com/onsi/ginkgo:go_default_library",
- "//vendor/github.com/stretchr/testify/assert: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/fields:go_default_library",
- "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
- "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
- "//vendor/k8s.io/client-go/kubernetes:go_default_library",
- "//vendor/k8s.io/client-go/tools/cache:go_default_library",
],
)
diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD
index fbec227aa5b..c39f21b35a1 100644
--- a/test/e2e/scheduling/BUILD
+++ b/test/e2e/scheduling/BUILD
@@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
+ "go_test",
)
go_library(
@@ -56,3 +57,23 @@ filegroup(
srcs = [":package-srcs"],
tags = ["automanaged"],
)
+
+go_test(
+ name = "go_default_test",
+ srcs = ["taints_test.go"],
+ library = ":go_default_library",
+ tags = ["automanaged"],
+ deps = [
+ "//test/e2e/framework:go_default_library",
+ "//test/utils:go_default_library",
+ "//vendor/github.com/onsi/ginkgo:go_default_library",
+ "//vendor/github.com/stretchr/testify/assert: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/fields:go_default_library",
+ "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+ "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
+ "//vendor/k8s.io/client-go/kubernetes:go_default_library",
+ "//vendor/k8s.io/client-go/tools/cache:go_default_library",
+ ],
+)
diff --git a/test/e2e/taints_test.go b/test/e2e/scheduling/taints_test.go
similarity index 99%
rename from test/e2e/taints_test.go
rename to test/e2e/scheduling/taints_test.go
index e00638c046c..72dd80a6f14 100644
--- a/test/e2e/taints_test.go
+++ b/test/e2e/scheduling/taints_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package e2e
+package scheduling
import (
"time"
@@ -144,7 +144,7 @@ const (
// - lack of eviction of tolerating pods from a tainted node,
// - delayed eviction of short-tolerating pod from a tainted node,
// - lack of eviction of short-tolerating pod after taint removal.
-var _ = framework.KubeDescribe("NoExecuteTaintManager [Serial]", func() {
+var _ = SIGDescribe("NoExecuteTaintManager [Serial]", func() {
var cs clientset.Interface
var nodeList *v1.NodeList
var ns string