diff --git a/test/e2e/storage/vsphere/persistent_volumes-vsphere.go b/test/e2e/storage/vsphere/persistent_volumes-vsphere.go index 15fbf56d294..7ebd17001a4 100644 --- a/test/e2e/storage/vsphere/persistent_volumes-vsphere.go +++ b/test/e2e/storage/vsphere/persistent_volumes-vsphere.go @@ -33,7 +33,7 @@ import ( ) // Testing configurations of single a PV/PVC pair attached to a vSphere Disk -var _ = utils.SIGDescribe("PersistentVolumes:vsphere", func() { +var _ = utils.SIGDescribe("PersistentVolumes:vsphere [Feature:vsphere]", func() { var ( c clientset.Interface ns string diff --git a/test/e2e/storage/vsphere/pv_reclaimpolicy.go b/test/e2e/storage/vsphere/pv_reclaimpolicy.go index 8a956dae91c..c81e96f8f75 100644 --- a/test/e2e/storage/vsphere/pv_reclaimpolicy.go +++ b/test/e2e/storage/vsphere/pv_reclaimpolicy.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/test/e2e/storage/utils" ) -var _ = utils.SIGDescribe("PersistentVolumes [Feature:ReclaimPolicy]", func() { +var _ = utils.SIGDescribe("PersistentVolumes [Feature:vsphere][Feature:ReclaimPolicy]", func() { f := framework.NewDefaultFramework("persistentvolumereclaim") var ( c clientset.Interface @@ -50,7 +50,7 @@ var _ = utils.SIGDescribe("PersistentVolumes [Feature:ReclaimPolicy]", func() { framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.TestContext.NodeSchedulableTimeout)) }) - utils.SIGDescribe("persistentvolumereclaim:vsphere", func() { + utils.SIGDescribe("persistentvolumereclaim:vsphere [Feature:vsphere]", func() { ginkgo.BeforeEach(func() { e2eskipper.SkipUnlessProviderIs("vsphere") Bootstrap(f) diff --git a/test/e2e/storage/vsphere/pvc_label_selector.go b/test/e2e/storage/vsphere/pvc_label_selector.go index 77401aa53cd..ec5c4698d01 100644 --- a/test/e2e/storage/vsphere/pvc_label_selector.go +++ b/test/e2e/storage/vsphere/pvc_label_selector.go @@ -21,7 +21,7 @@ import ( "time" "github.com/onsi/ginkgo" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" @@ -47,7 +47,7 @@ import ( 9. delete pvcVvol */ -var _ = utils.SIGDescribe("PersistentVolumes [Feature:LabelSelector]", func() { +var _ = utils.SIGDescribe("PersistentVolumes [Feature:vsphere][Feature:LabelSelector]", func() { f := framework.NewDefaultFramework("pvclabelselector") var ( c clientset.Interface @@ -75,7 +75,7 @@ var _ = utils.SIGDescribe("PersistentVolumes [Feature:LabelSelector]", func() { }) - utils.SIGDescribe("Selector-Label Volume Binding:vsphere", func() { + utils.SIGDescribe("Selector-Label Volume Binding:vsphere [Feature:vsphere]", func() { ginkgo.AfterEach(func() { ginkgo.By("Running clean up actions") if framework.ProviderIs("vsphere") { diff --git a/test/e2e/storage/vsphere/vsphere_statefulsets.go b/test/e2e/storage/vsphere/vsphere_statefulsets.go index 7eaf381c00a..2099324e457 100644 --- a/test/e2e/storage/vsphere/vsphere_statefulsets.go +++ b/test/e2e/storage/vsphere/vsphere_statefulsets.go @@ -54,7 +54,7 @@ const ( storageclassname = "nginx-sc" ) -var _ = utils.SIGDescribe("vsphere statefulset", func() { +var _ = utils.SIGDescribe("vsphere statefulset [Feature:vsphere]", func() { f := framework.NewDefaultFramework("vsphere-statefulset") var ( namespace string diff --git a/test/e2e/storage/vsphere/vsphere_volume_placement.go b/test/e2e/storage/vsphere/vsphere_volume_placement.go index 7222e9e072c..36b8ba3259e 100644 --- a/test/e2e/storage/vsphere/vsphere_volume_placement.go +++ b/test/e2e/storage/vsphere/vsphere_volume_placement.go @@ -24,7 +24,7 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" clientset "k8s.io/client-go/kubernetes" @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/test/e2e/storage/utils" ) -var _ = utils.SIGDescribe("Volume Placement", func() { +var _ = utils.SIGDescribe("Volume Placement [Feature:vsphere]", func() { f := framework.NewDefaultFramework("volume-placement") const ( NodeLabelKey = "vsphere_e2e_label_volume_placement" diff --git a/test/e2e/storage/vsphere/vsphere_zone_support.go b/test/e2e/storage/vsphere/vsphere_zone_support.go index 270af5f7c98..f30a5b345ab 100644 --- a/test/e2e/storage/vsphere/vsphere_zone_support.go +++ b/test/e2e/storage/vsphere/vsphere_zone_support.go @@ -85,7 +85,7 @@ import ( 5. Tests to verify dynamic pv creation using availability zones work across different datacenters in the same VC. */ -var _ = utils.SIGDescribe("Zone Support", func() { +var _ = utils.SIGDescribe("Zone Support [Feature:vsphere]", func() { f := framework.NewDefaultFramework("zone-support") var ( client clientset.Interface