From a50bc8e7cb5181f23f64e233aff7126a408aa546 Mon Sep 17 00:00:00 2001 From: guangxuli Date: Tue, 7 Nov 2017 10:46:17 +0800 Subject: [PATCH 1/2] migration pod relevant e2e tests to sig node --- test/e2e/{ => node}/events.go | 4 ++-- test/e2e/{ => node}/pod_gc.go | 4 ++-- test/e2e/{ => node}/pods.go | 4 ++-- test/e2e/{ => node}/pre_stop.go | 4 ++-- test/e2e/{ => node}/ssh.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename test/e2e/{ => node}/events.go (98%) rename test/e2e/{ => node}/pod_gc.go (95%) rename test/e2e/{ => node}/pods.go (99%) rename test/e2e/{ => node}/pre_stop.go (98%) rename test/e2e/{ => node}/ssh.go (98%) diff --git a/test/e2e/events.go b/test/e2e/node/events.go similarity index 98% rename from test/e2e/events.go rename to test/e2e/node/events.go index 40da4bd674d..84179de1324 100644 --- a/test/e2e/events.go +++ b/test/e2e/node/events.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package node import ( "fmt" @@ -33,7 +33,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("Events", func() { +var _ = SIGDescribe("Events", func() { f := framework.NewDefaultFramework("events") framework.ConformanceIt("should be sent by kubelets and the scheduler about pods scheduling and running ", func() { diff --git a/test/e2e/pod_gc.go b/test/e2e/node/pod_gc.go similarity index 95% rename from test/e2e/pod_gc.go rename to test/e2e/node/pod_gc.go index 6d9c52f4021..c621eaabfd1 100644 --- a/test/e2e/pod_gc.go +++ b/test/e2e/node/pod_gc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package node import ( "fmt" @@ -32,7 +32,7 @@ import ( // This test requires that --terminated-pod-gc-threshold=100 be set on the controller manager // // Slow by design (7 min) -var _ = framework.KubeDescribe("Pod garbage collector [Feature:PodGarbageCollector] [Slow]", func() { +var _ = SIGDescribe("Pod garbage collector [Feature:PodGarbageCollector] [Slow]", func() { f := framework.NewDefaultFramework("pod-garbage-collector") It("should handle the creation of 1000 pods", func() { var count int diff --git a/test/e2e/pods.go b/test/e2e/node/pods.go similarity index 99% rename from test/e2e/pods.go rename to test/e2e/node/pods.go index fbe39de7dd6..080fe1d4de7 100644 --- a/test/e2e/pods.go +++ b/test/e2e/node/pods.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package node import ( "crypto/tls" @@ -38,7 +38,7 @@ import ( imageutils "k8s.io/kubernetes/test/utils/image" ) -var _ = framework.KubeDescribe("Pods Extended", func() { +var _ = SIGDescribe("Pods Extended", func() { f := framework.NewDefaultFramework("pods") framework.KubeDescribe("Delete Grace Period", func() { diff --git a/test/e2e/pre_stop.go b/test/e2e/node/pre_stop.go similarity index 98% rename from test/e2e/pre_stop.go rename to test/e2e/node/pre_stop.go index 0543a6b0c11..ba0d9e861d2 100644 --- a/test/e2e/pre_stop.go +++ b/test/e2e/node/pre_stop.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package node import ( "context" @@ -158,7 +158,7 @@ func testPreStop(c clientset.Interface, ns string) { framework.ExpectNoError(err, "validating pre-stop.") } -var _ = framework.KubeDescribe("PreStop", func() { +var _ = SIGDescribe("PreStop", func() { f := framework.NewDefaultFramework("prestop") /* diff --git a/test/e2e/ssh.go b/test/e2e/node/ssh.go similarity index 98% rename from test/e2e/ssh.go rename to test/e2e/node/ssh.go index 12750a63506..ad61f4d9e4f 100644 --- a/test/e2e/ssh.go +++ b/test/e2e/node/ssh.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package e2e +package node import ( "fmt" @@ -27,7 +27,7 @@ import ( const maxNodes = 100 -var _ = framework.KubeDescribe("SSH", func() { +var _ = SIGDescribe("SSH", func() { f := framework.NewDefaultFramework("ssh") From 7c7392014d3405b06643194b2fc582e1ee8d5ba9 Mon Sep 17 00:00:00 2001 From: guangxuli Date: Tue, 7 Nov 2017 10:46:47 +0800 Subject: [PATCH 2/2] update autogen BUILD files --- test/conformance/testdata/conformance.txt | 8 ++++---- test/e2e/BUILD | 9 --------- test/e2e/node/BUILD | 10 ++++++++++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 10ec6077e08..a1b79a138ff 100755 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -108,7 +108,6 @@ test/e2e/common/secrets_volume.go: "should be consumable from pods in volume wit test/e2e/common/secrets_volume.go: "should be consumable from pods in volume with mappings and Item Mode set " test/e2e/common/secrets_volume.go: "should be consumable in multiple volumes in a pod " test/e2e/common/secrets_volume.go: "optional updates should be reflected in volume " -test/e2e/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running " test/e2e/kubectl/kubectl.go: "should create and stop a replication controller " test/e2e/kubectl/kubectl.go: "should scale a replication controller " test/e2e/kubectl/kubectl.go: "should do a rolling update of a replication controller " @@ -142,9 +141,10 @@ test/e2e/network/service.go: "should provide secure master service " test/e2e/network/service.go: "should serve a basic endpoint from pods " test/e2e/network/service.go: "should serve multiport endpoints from pods " test/e2e/network/service_latency.go: "should not be very high " -test/e2e/pods.go: "should be submitted and removed [Flaky]" -test/e2e/pods.go: "should be submitted and removed " -test/e2e/pre_stop.go: "should call prestop when killing a pod " +test/e2e/node/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running " +test/e2e/node/pods.go: "should be submitted and removed [Flaky]" +test/e2e/node/pods.go: "should be submitted and removed " +test/e2e/node/pre_stop.go: "should call prestop when killing a pod " test/e2e/scheduling/predicates.go: "validates resource limits of pods that are allowed to run " test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if not matching " test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if matching " diff --git a/test/e2e/BUILD b/test/e2e/BUILD index db510d85166..8210ef377f7 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -38,14 +38,9 @@ go_library( name = "go_default_library", srcs = [ "e2e.go", - "events.go", "examples.go", "gke_local_ssd.go", "gke_node_pools.go", - "pod_gc.go", - "pods.go", - "pre_stop.go", - "ssh.go", ], importpath = "k8s.io/kubernetes/test/e2e", deps = [ @@ -62,7 +57,6 @@ go_library( "//test/e2e/generated:go_default_library", "//test/e2e/manifest:go_default_library", "//test/utils:go_default_library", - "//test/utils/image:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo/config:go_default_library", @@ -70,15 +64,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/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/schema: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", - "//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", ], diff --git a/test/e2e/node/BUILD b/test/e2e/node/BUILD index b1a2c719cf7..b8db42fbe08 100644 --- a/test/e2e/node/BUILD +++ b/test/e2e/node/BUILD @@ -4,10 +4,15 @@ go_library( name = "go_default_library", srcs = [ "apparmor.go", + "events.go", "framework.go", "kubelet.go", "kubelet_perf.go", + "pod_gc.go", + "pods.go", + "pre_stop.go", "security_context.go", + "ssh.go", ], importpath = "k8s.io/kubernetes/test/e2e/node", visibility = ["//visibility:public"], @@ -17,13 +22,18 @@ go_library( "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/utils:go_default_library", + "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/api/core/v1: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/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/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", ], )