From 917a94ee8a0c24415598783d2c86c6ea69aa5030 Mon Sep 17 00:00:00 2001 From: Gavin Date: Wed, 1 Nov 2017 14:14:09 +0800 Subject: [PATCH 1/2] migrate network_partition to sig apps --- test/e2e/{ => apps}/network_partition.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename test/e2e/{ => apps}/network_partition.go (99%) diff --git a/test/e2e/network_partition.go b/test/e2e/apps/network_partition.go similarity index 99% rename from test/e2e/network_partition.go rename to test/e2e/apps/network_partition.go index 10aa30cf6da..26e3443e06a 100644 --- a/test/e2e/network_partition.go +++ b/test/e2e/apps/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 From b10cbf2e85814766f6233a4f682a379ee2ac89ab Mon Sep 17 00:00:00 2001 From: Gavin Date: Wed, 1 Nov 2017 14:14:26 +0800 Subject: [PATCH 2/2] update autogen BUILD files --- test/e2e/BUILD | 5 ----- test/e2e/apps/BUILD | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index c1b242f8d23..db510d85166 100644 --- 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", ], ) diff --git a/test/e2e/apps/BUILD b/test/e2e/apps/BUILD index 29efb086b1b..c25d2f18add 100644 --- 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",