From a50bc8e7cb5181f23f64e233aff7126a408aa546 Mon Sep 17 00:00:00 2001
From: guangxuli <li.guangxu@zte.com.cn>
Date: Tue, 7 Nov 2017 10:46:17 +0800
Subject: [PATCH] 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 40da4bd674..84179de132 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 6d9c52f402..c621eaabfd 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 fbe39de7dd..080fe1d4de 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 0543a6b0c1..ba0d9e861d 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 12750a6350..ad61f4d9e4 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")