Minor refactor of test/e2e/common names

test/e2e/common/BUILD

@@ -17,6 +17,7 @@ go_library(
         "downwardapi_volume.go",
         "empty_dir.go",
         "expansion.go",
+        "framework.go",
         "host_path.go",
         "init_container.go",
         "kubelet.go",

test/e2e/common/configmap.go

@@ -31,7 +31,7 @@ import (
 	"github.com/onsi/ginkgo"
 )
 
-var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
+var _ = SIGNodeDescribe("ConfigMap", func() {
 	f := framework.NewDefaultFramework("configmap")
 
 	/*

test/e2e/common/configmap_volume.go

@@ -33,7 +33,7 @@ import (
 	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
-var _ = ginkgo.Describe("[sig-storage] ConfigMap", func() {
+var _ = SIGStorageDescribe("ConfigMap", func() {
 	f := framework.NewDefaultFramework("configmap")
 
 	/*

test/e2e/common/downward_api.go

@@ -31,7 +31,7 @@ import (
 	"github.com/onsi/ginkgo"
 )
 
-var _ = ginkgo.Describe("[sig-node] Downward API", func() {
+var _ = SIGNodeDescribe("Downward API", func() {
 	f := framework.NewDefaultFramework("downward-api")
 
 	/*

test/e2e/common/downwardapi_volume.go

@@ -33,7 +33,7 @@ import (
 	"github.com/onsi/gomega"
 )
 
-var _ = ginkgo.Describe("[sig-storage] Downward API volume", func() {
+var _ = SIGStorageDescribe("Downward API volume", func() {
 	// How long to wait for a log pod to be displayed
 	const podLogTimeout = 3 * time.Minute
 	f := framework.NewDefaultFramework("downward-api")

test/e2e/common/empty_dir.go

@@ -42,7 +42,7 @@ var (
 	nonRootUID = int64(1001)
 )
 
-var _ = ginkgo.Describe("[sig-storage] EmptyDir volumes", func() {
+var _ = SIGStorageDescribe("EmptyDir volumes", func() {
 	f := framework.NewDefaultFramework("emptydir")
 
 	ginkgo.Context("when FSGroup is specified [LinuxOnly] [NodeFeature:FSGroup]", func() {

test/e2e/common/framework.go

@@ -0,0 +1,34 @@
+/*
+Copyright 2021 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 common
+
+import "k8s.io/kubernetes/test/e2e/framework"
+
+// SIGNetworkDescribe annotates the test with the SIG Network label.
+func SIGNetworkDescribe(text string, body func()) bool {
+	return framework.KubeDescribe("[sig-network] "+text, body)
+}
+
+// SIGNodeDescribe annotates the test with the SIG Node label.
+func SIGNodeDescribe(text string, body func()) bool {
+	return framework.KubeDescribe("[sig-node] "+text, body)
+}
+
+// SIGStorageDescribe annotates the test with the SIG Storage label.
+func SIGStorageDescribe(text string, body func()) bool {
+	return framework.KubeDescribe("[sig-storage] "+text, body)
+}

test/e2e/common/host_path.go

@@ -31,7 +31,7 @@ import (
 
 //TODO : Consolidate this code with the code for emptyDir.
 //This will require some smart.
-var _ = ginkgo.Describe("[sig-storage] HostPath", func() {
+var _ = SIGStorageDescribe("HostPath", func() {
 	f := framework.NewDefaultFramework("hostpath")
 
 	ginkgo.BeforeEach(func() {

test/e2e/common/networking.go

@@ -24,7 +24,7 @@ import (
 	e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
 )
 
-var _ = ginkgo.Describe("[sig-network] Networking", func() {
+var _ = SIGNetworkDescribe("Networking", func() {
 	f := framework.NewDefaultFramework("pod-network-test")
 
 	ginkgo.Describe("Granular Checks: Pods", func() {

test/e2e/common/podtemplates.go

@@ -38,7 +38,7 @@ const (
 	podTemplateRetryTimeout = 1 * time.Minute
 )
 
-var _ = ginkgo.Describe("[sig-node] PodTemplates", func() {
+var _ = SIGNodeDescribe("PodTemplates", func() {
 	f := framework.NewDefaultFramework("podtemplate")
 	/*
 	   Release: v1.19

test/e2e/common/projected_combined.go

@@ -29,7 +29,7 @@ import (
 	"github.com/onsi/ginkgo"
 )
 
-var _ = ginkgo.Describe("[sig-storage] Projected combined", func() {
+var _ = SIGStorageDescribe("Projected combined", func() {
 	f := framework.NewDefaultFramework("projected")
 
 	// Test multiple projections

test/e2e/common/projected_configmap.go

@@ -33,7 +33,7 @@ import (
 	"github.com/onsi/gomega"
 )
 
-var _ = ginkgo.Describe("[sig-storage] Projected configMap", func() {
+var _ = SIGStorageDescribe("Projected configMap", func() {
 	f := framework.NewDefaultFramework("projected")
 
 	/*

test/e2e/common/projected_downwardapi.go

@@ -32,7 +32,7 @@ import (
 	"github.com/onsi/gomega"
 )
 
-var _ = ginkgo.Describe("[sig-storage] Projected downwardAPI", func() {
+var _ = SIGStorageDescribe("Projected downwardAPI", func() {
 	f := framework.NewDefaultFramework("projected")
 
 	// How long to wait for a log pod to be displayed

test/e2e/common/projected_secret.go

@@ -32,7 +32,7 @@ import (
 	"github.com/onsi/gomega"
 )
 
-var _ = ginkgo.Describe("[sig-storage] Projected secret", func() {
+var _ = SIGStorageDescribe("Projected secret", func() {
 	f := framework.NewDefaultFramework("projected")
 
 	/*

test/e2e/common/runtimeclass.go

@@ -39,7 +39,7 @@ import (
 	"github.com/onsi/ginkgo"
 )
 
-var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
+var _ = SIGNodeDescribe("RuntimeClass", func() {
 	f := framework.NewDefaultFramework("runtimeclass")
 
 	ginkgo.It("should reject a Pod requesting a non-existent RuntimeClass [NodeFeature:RuntimeHandler]", func() {

test/e2e/common/secrets_volume.go

@@ -33,7 +33,7 @@ import (
 	"github.com/onsi/gomega"
 )
 
-var _ = ginkgo.Describe("[sig-storage] Secrets", func() {
+var _ = SIGStorageDescribe("Secrets", func() {
 	f := framework.NewDefaultFramework("secrets")
 
 	/*

test/e2e/common/volumes.go

@@ -58,7 +58,7 @@ import (
 
 // These tests need privileged containers, which are disabled by default.  Run
 // tests with "--ginkgo.focus=[Feature:Volumes]"
-var _ = ginkgo.Describe("[sig-storage] GCP Volumes", func() {
+var _ = SIGStorageDescribe("GCP Volumes", func() {
 	f := framework.NewDefaultFramework("gcp-volume")
 
 	// note that namespace deletion is handled by delete-namespace flag

test/e2e/node/runtimeclass.go

@@ -35,7 +35,7 @@ import (
 	"github.com/onsi/gomega"
 )
 
-var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
+var _ = SIGDescribe("RuntimeClass", func() {
 	f := framework.NewDefaultFramework("runtimeclass")
 
 	ginkgo.It("should reject a Pod requesting a RuntimeClass with conflicting node selector", func() {