Merge pull request #54374 from guangxuli/fix-scheduling-migration-1020

Automatic merge from submit-queue (batch tested with PRs 53903, 53914, 54374). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Migrate resource relevant e2e test files to sig scheduling **What this PR does / why we need it**: Migrate resource relevant e2e test files to sig scheduling. Not fully sure whether these e2e files belong to sig-node or sig-scheduling, feel free to contact me if you have better solution. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # Ref Umbrella issue #49161 **Special notes for your reviewer**: **Release note**: ```release-note none ```

Merge pull request #54374 from guangxuli/fix-scheduling-migration-1020
067f2db3 · Kubernetes Submit Queue · GitHub · 6a444673 · 441fed1a · 067f2db3
Commit 067f2db3 authored Oct 23, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 23, 2017
5 changed files
--- 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",

--- 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
 )

--- 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",
    ],
 )

--- a/test/e2e/limit_range.go
+++ b/test/e2e/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() {

--- a/test/e2e/resource_quota.go
+++ b/test/e2e/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() {