Merge pull request #49483 from xiangpengzhao/e2e-sig-network

test/e2e/network/BUILD

@@ -15,6 +15,7 @@ go_library(
         "dns_configmap.go",
         "doc.go",
         "firewall.go",
+        "framework.go",
         "kube_proxy.go",
         "network_policy.go",
         "networking.go",

test/e2e/network/dns.go

@@ -286,7 +286,7 @@ func reverseArray(arr []string) []string {
 	return arr
 }
 
-var _ = framework.KubeDescribe("DNS", func() {
+var _ = SIGDescribe("DNS", func() {
 	f := framework.NewDefaultFramework("dns")
 
 	It("should provide DNS for the cluster [Conformance]", func() {

test/e2e/network/dns_configmap.go

@@ -22,7 +22,6 @@ import (
 
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/kubernetes/test/e2e/framework"
 
 	. "github.com/onsi/ginkgo"
 )
@@ -34,7 +33,7 @@ type dnsFederationsConfigMapTest struct {
 	isValid bool
 }
 
-var _ = framework.KubeDescribe("DNS configMap federations", func() {
+var _ = SIGDescribe("DNS configMap federations", func() {
 	t := &dnsNameserverTest{dnsTestCommon: newDnsTestCommon()}
 	BeforeEach(func() { t.c = t.f.ClientSet })
 
@@ -186,7 +185,7 @@ func (t *dnsNameserverTest) run() {
 		moreForeverTestTimeout)
 }
 
-var _ = framework.KubeDescribe("DNS configMap nameserver", func() {
+var _ = SIGDescribe("DNS configMap nameserver", func() {
 	t := &dnsNameserverTest{dnsTestCommon: newDnsTestCommon()}
 	BeforeEach(func() { t.c = t.f.ClientSet })
 

test/e2e/network/firewall.go

@@ -32,7 +32,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = framework.KubeDescribe("Firewall rule", func() {
+var _ = SIGDescribe("Firewall rule", func() {
 	var firewall_test_name = "firewall-test"
 	f := framework.NewDefaultFramework(firewall_test_name)
 

test/e2e/network/framework.go

+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package network
+
+import "github.com/onsi/ginkgo"
+
+func SIGDescribe(text string, body func()) bool {
+	return ginkgo.Describe("[sig-network] "+text, body)
+}

test/e2e/network/kube_proxy.go

@@ -36,7 +36,7 @@ import (
 
 const kubeProxyE2eImage = "gcr.io/google_containers/e2e-net-amd64:1.0"
 
-var _ = framework.KubeDescribe("Network", func() {
+var _ = SIGDescribe("Network", func() {
 	const (
 		testDaemonHttpPort    = 11301
 		testDaemonTcpPort     = 11302

test/e2e/network/network_policy.go

@@ -38,7 +38,7 @@ connections from one of the clients. The test then asserts that the clients
 failed or succesfully connected as expected.
 */
 
-var _ = framework.KubeDescribe("NetworkPolicy", func() {
+var _ = SIGDescribe("NetworkPolicy", func() {
 	f := framework.NewDefaultFramework("network-policy")
 
 	It("should support a 'default-deny' policy [Feature:NetworkPolicy]", func() {

test/e2e/network/networking.go

@@ -27,7 +27,7 @@ import (
 	. "github.com/onsi/ginkgo"
 )
 
-var _ = framework.KubeDescribe("Networking", func() {
+var _ = SIGDescribe("Networking", func() {
 	var svcname = "nettest"
 	f := framework.NewDefaultFramework(svcname)
 
@@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("Networking", func() {
 	})
 
 	// TODO: Remove [Slow] when this has had enough bake time to prove presubmit worthiness.
-	framework.KubeDescribe("Granular Checks: Services [Slow]", func() {
+	SIGDescribe("Granular Checks: Services [Slow]", func() {
 
 		It("should function for pod-Service: http", func() {
 			config := framework.NewNetworkingTestConfig(f)

test/e2e/network/networking_perf.go

@@ -37,7 +37,7 @@ const (
 
 // Declared as Flakey since it has not been proven to run in parallel on small nodes or slow networks in CI
 // TODO jayunit100 : Retag this test according to semantics from #22401
-var _ = framework.KubeDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-Performance]", func() {
+var _ = SIGDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-Performance]", func() {
 
 	f := framework.NewDefaultFramework("network-perf")
 

test/e2e/network/service.go

@@ -39,7 +39,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = framework.KubeDescribe("Services", func() {
+var _ = SIGDescribe("Services", func() {
 	f := framework.NewDefaultFramework("services")
 
 	var cs clientset.Interface
@@ -1409,7 +1409,7 @@ var _ = framework.KubeDescribe("Services", func() {
 	})
 })
 
-var _ = framework.KubeDescribe("ESIPP [Slow]", func() {
+var _ = SIGDescribe("ESIPP [Slow]", func() {
 	f := framework.NewDefaultFramework("esipp")
 	loadBalancerCreateTimeout := framework.LoadBalancerCreateTimeoutDefault