From 441fed1a9f07c00e789509fb8ede136b077d35fe Mon Sep 17 00:00:00 2001 From: Gavin Date: Fri, 20 Oct 2017 12:38:55 +0800 Subject: [PATCH] migrate resource related files to sig scheduling --- test/e2e/BUILD | 5 ----- test/e2e/e2e.go | 5 ----- test/e2e/scheduling/BUILD | 5 +++++ test/e2e/{ => scheduling}/limit_range.go | 8 ++++++-- test/e2e/{ => scheduling}/resource_quota.go | 4 ++-- 5 files changed, 13 insertions(+), 14 deletions(-) rename test/e2e/{ => scheduling}/limit_range.go (98%) rename test/e2e/{ => scheduling}/resource_quota.go (99%) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 3c89a86d355..aa2ba4237cc 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -43,12 +43,10 @@ go_library( "examples.go", "gke_local_ssd.go", "gke_node_pools.go", - "limit_range.go", "network_partition.go", "pod_gc.go", "pods.go", "pre_stop.go", - "resource_quota.go", "ssh.go", ], importpath = "k8s.io/kubernetes/test/e2e", @@ -61,7 +59,6 @@ go_library( "//pkg/cloudprovider/providers/gce:go_default_library", "//pkg/controller/node:go_default_library", "//pkg/kubectl/util/logs:go_default_library", - "//pkg/quota/evaluator/core:go_default_library", "//pkg/version:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", @@ -78,14 +75,12 @@ go_library( "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/rbac/v1beta1: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", "//vendor/k8s.io/apimachinery/pkg/fields: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/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index b7d937d7b1b..a335d5aac45 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -47,11 +47,6 @@ import ( testutils "k8s.io/kubernetes/test/utils" ) -const ( - // TODO: Delete this once all the tests that depend upon it are moved out of test/e2e and into subdirs - podName = "pfpod" -) - var ( cloudConfig = &framework.TestContext.CloudConfig ) diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD index 77ca3b90cf2..0ecb89e2b7d 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -12,18 +12,21 @@ go_library( "equivalence_cache_predicates.go", "events.go", "framework.go", + "limit_range.go", "nvidia-gpus.go", "opaque_resource.go", "predicates.go", "preemption.go", "priorities.go", "rescheduler.go", + "resource_quota.go", ], importpath = "k8s.io/kubernetes/test/e2e/scheduling", deps = [ "//pkg/api:go_default_library", "//pkg/api/v1/helper:go_default_library", "//pkg/api/v1/pod:go_default_library", + "//pkg/quota/evaluator/core:go_default_library", "//pkg/util/system:go_default_library", "//pkg/util/version:go_default_library", "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", @@ -41,8 +44,10 @@ go_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/types: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/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", ], ) diff --git a/test/e2e/limit_range.go b/test/e2e/scheduling/limit_range.go similarity index 98% rename from test/e2e/limit_range.go rename to test/e2e/scheduling/limit_range.go index 466544dee8c..cbb52185f17 100644 --- a/test/e2e/limit_range.go +++ b/test/e2e/scheduling/limit_range.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package scheduling import ( "fmt" @@ -28,7 +28,11 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("LimitRange", func() { +const ( + podName = "pfpod" +) + +var _ = SIGDescribe("LimitRange", func() { f := framework.NewDefaultFramework("limitrange") It("should create a LimitRange with defaults and ensure pod has those defaults applied.", func() { diff --git a/test/e2e/resource_quota.go b/test/e2e/scheduling/resource_quota.go similarity index 99% rename from test/e2e/resource_quota.go rename to test/e2e/scheduling/resource_quota.go index 1a58a07055a..74fe7099457 100644 --- a/test/e2e/resource_quota.go +++ b/test/e2e/scheduling/resource_quota.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package scheduling import ( "fmt" @@ -41,7 +41,7 @@ const ( var classGold string = "gold" -var _ = framework.KubeDescribe("ResourceQuota", func() { +var _ = SIGDescribe("ResourceQuota", func() { f := framework.NewDefaultFramework("resourcequota") It("should create a ResourceQuota and ensure its status is promptly calculated.", func() {