Merge pull request #54787 from guangxuli/fix-apps-e2e-test

Automatic merge from submit-queue (batch tested with PRs 54787, 51940). 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 netwrok partition test to sig apps **What this PR does / why we need it**: Migrate network partition relevant e2e test to sig-app. **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 #54787 from guangxuli/fix-apps-e2e-test
5ad58228 · Kubernetes Submit Queue · GitHub · d595003e · b10cbf2e · 5ad58228
Unverified Commit 5ad58228 authored Nov 02, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 8 deletions

BUILD test/e2e/BUILD +0 -5

BUILD test/e2e/apps/BUILD +5 -0

network_partition.go test/e2e/apps/network_partition.go +2 -3

No files found.
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -42,7 +42,6 @@ go_library(
        "examples.go",
        "gke_local_ssd.go",
        "gke_node_pools.go",
-        "network_partition.go",
        "pod_gc.go",
        "pods.go",
        "pre_stop.go",
@@ -50,12 +49,10 @@ go_library(
    ],
    importpath = "k8s.io/kubernetes/test/e2e",
    deps = [
-        "//pkg/api:go_default_library",
        "//pkg/api/testapi:go_default_library",
        "//pkg/api/v1/pod:go_default_library",
        "//pkg/cloudprovider/providers/azure:go_default_library",
        "//pkg/cloudprovider/providers/gce:go_default_library",
-        "//pkg/controller/node:go_default_library",
        "//pkg/kubectl/util/logs:go_default_library",
        "//pkg/version:go_default_library",
        "//test/e2e/common:go_default_library",
@@ -77,7 +74,6 @@ go_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/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
@@ -85,7 +81,6 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
-        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
    ],
 )

--- a/test/e2e/apps/BUILD
+++ b/test/e2e/apps/BUILD
@@ -15,6 +15,7 @@ go_library(
        "disruption.go",
        "framework.go",
        "job.go",
+        "network_partition.go",
        "rc.go",
        "replica_set.go",
        "statefulset.go",
@@ -22,6 +23,7 @@ go_library(
    ],
    importpath = "k8s.io/kubernetes/test/e2e/apps",
    deps = [
+        "//pkg/api:go_default_library",
        "//pkg/api/legacyscheme:go_default_library",
        "//pkg/api/v1/pod:go_default_library",
        "//pkg/apis/batch:go_default_library",
@@ -31,12 +33,14 @@ go_library(
        "//pkg/controller/daemon:go_default_library",
        "//pkg/controller/deployment/util:go_default_library",
        "//pkg/controller/job:go_default_library",
+        "//pkg/controller/node:go_default_library",
        "//pkg/controller/replicaset:go_default_library",
        "//pkg/controller/replication:go_default_library",
        "//pkg/kubectl:go_default_library",
        "//pkg/master/ports:go_default_library",
        "//pkg/util/pointer:go_default_library",
        "//plugin/pkg/scheduler/schedulercache:go_default_library",
+        "//test/e2e/common:go_default_library",
        "//test/e2e/framework:go_default_library",
        "//test/utils:go_default_library",
        "//test/utils/image:go_default_library",
@@ -54,6 +58,7 @@ go_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",

--- a/test/e2e/network_partition.go
+++ b/test/e2e/network_partition.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
-package e2e
+package apps
 import (
 	"fmt"
@@ -43,7 +43,6 @@ import (
 )
 const (
-	timeout                = 60 * time.Second
 	podReadyTimeout        = 2 * time.Minute
 	podNotReadyTimeout     = 1 * time.Minute
 	nodeReadinessTimeout   = 3 * time.Minute
@@ -103,7 +102,7 @@ func newPodOnNode(c clientset.Interface, namespace, podName, nodeName string) er
 	return err
 }
-var _ = framework.KubeDescribe("[sig-apps] Network Partition [Disruptive] [Slow]", func() {
+var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
 	f := framework.NewDefaultFramework("network-partition")
 	var systemPodsNo int32
 	var c clientset.Interface