From 678ca905d69e7fa56cba8b3c6eb680f9b5d4393b Mon Sep 17 00:00:00 2001 From: Ryan Hitchman Date: Tue, 11 Jul 2017 18:38:01 -0700 Subject: [PATCH] Remove volume tags. --- test/e2e/storage/pd.go | 16 ++++++++-------- .../e2e/storage/persistent_volumes-disruptive.go | 2 +- test/e2e/storage/persistent_volumes-gce.go | 2 +- test/e2e/storage/persistent_volumes.go | 2 +- test/e2e/storage/volume_provisioning.go | 14 +++++++------- test/e2e/storage/volumes.go | 2 +- test/e2e/storage/vsphere_volume_fstype.go | 2 +- test/e2e/storage/vsphere_volume_ops_storm.go | 2 +- test/e2e/storage/vsphere_volume_placement.go | 2 +- test/e2e/storage/vsphere_volume_vsan_policy.go | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/test/e2e/storage/pd.go b/test/e2e/storage/pd.go index 37f3b6f73cf..5859c4be570 100644 --- a/test/e2e/storage/pd.go +++ b/test/e2e/storage/pd.go @@ -73,7 +73,7 @@ var _ = SIGDescribe("Pod Disks", func() { mathrand.Seed(time.Now().UTC().UnixNano()) }) - It("should schedule a pod w/ a RW PD, ungracefully remove it, then schedule it on another host [Slow] [Volume]", func() { + It("should schedule a pod w/ a RW PD, ungracefully remove it, then schedule it on another host [Slow]", func() { framework.SkipUnlessProviderIs("gce", "gke", "aws") By("creating PD") @@ -133,7 +133,7 @@ var _ = SIGDescribe("Pod Disks", func() { return }) - It("Should schedule a pod w/ a RW PD, gracefully remove it, then schedule it on another host [Slow] [Volume]", func() { + It("Should schedule a pod w/ a RW PD, gracefully remove it, then schedule it on another host [Slow]", func() { framework.SkipUnlessProviderIs("gce", "gke", "aws") By("creating PD") @@ -193,7 +193,7 @@ var _ = SIGDescribe("Pod Disks", func() { return }) - It("should schedule a pod w/ a readonly PD on two hosts, then remove both ungracefully. [Slow] [Volume]", func() { + It("should schedule a pod w/ a readonly PD on two hosts, then remove both ungracefully. [Slow]", func() { framework.SkipUnlessProviderIs("gce", "gke") By("creating PD") @@ -245,7 +245,7 @@ var _ = SIGDescribe("Pod Disks", func() { waitForPDDetach(diskName, host1Name) }) - It("Should schedule a pod w/ a readonly PD on two hosts, then remove both gracefully. [Slow] [Volume]", func() { + It("Should schedule a pod w/ a readonly PD on two hosts, then remove both gracefully. [Slow]", func() { framework.SkipUnlessProviderIs("gce", "gke") By("creating PD") @@ -297,7 +297,7 @@ var _ = SIGDescribe("Pod Disks", func() { waitForPDDetach(diskName, host1Name) }) - It("should schedule a pod w/ a RW PD shared between multiple containers, write to PD, delete pod, verify contents, and repeat in rapid succession [Slow] [Volume]", func() { + It("should schedule a pod w/ a RW PD shared between multiple containers, write to PD, delete pod, verify contents, and repeat in rapid succession [Slow]", func() { framework.SkipUnlessProviderIs("gce", "gke", "aws") By("creating PD") @@ -350,7 +350,7 @@ var _ = SIGDescribe("Pod Disks", func() { waitForPDDetach(diskName, host0Name) }) - It("should schedule a pod w/two RW PDs both mounted to one container, write to PD, verify contents, delete pod, recreate pod, verify contents, and repeat in rapid succession [Slow] [Volume]", func() { + It("should schedule a pod w/two RW PDs both mounted to one container, write to PD, verify contents, delete pod, recreate pod, verify contents, and repeat in rapid succession [Slow]", func() { framework.SkipUnlessProviderIs("gce", "gke", "aws") By("creating PD1") @@ -410,7 +410,7 @@ var _ = SIGDescribe("Pod Disks", func() { waitForPDDetach(disk2Name, host0Name) }) - It("should be able to detach from a node which was deleted [Slow] [Disruptive] [Volume]", func() { + It("should be able to detach from a node which was deleted [Slow] [Disruptive]", func() { framework.SkipUnlessProviderIs("gce") initialGroupSize, err := framework.GroupSize(framework.TestContext.CloudConfig.NodeInstanceGroup) @@ -469,7 +469,7 @@ var _ = SIGDescribe("Pod Disks", func() { return }) - It("should be able to detach from a node whose api object was deleted [Slow] [Disruptive] [Volume]", func() { + It("should be able to detach from a node whose api object was deleted [Slow] [Disruptive]", func() { framework.SkipUnlessProviderIs("gce") initialGroupSize, err := framework.GroupSize(framework.TestContext.CloudConfig.NodeInstanceGroup) framework.ExpectNoError(err, "Error getting group size") diff --git a/test/e2e/storage/persistent_volumes-disruptive.go b/test/e2e/storage/persistent_volumes-disruptive.go index dd4cd71f4ec..f25316b8c4a 100644 --- a/test/e2e/storage/persistent_volumes-disruptive.go +++ b/test/e2e/storage/persistent_volumes-disruptive.go @@ -46,7 +46,7 @@ const ( kRestart kubeletOpt = "restart" ) -var _ = SIGDescribe("PersistentVolumes [Volume][Disruptive][Flaky]", func() { +var _ = SIGDescribe("PersistentVolumes[Disruptive][Flaky]", func() { f := framework.NewDefaultFramework("disruptive-pv") var ( diff --git a/test/e2e/storage/persistent_volumes-gce.go b/test/e2e/storage/persistent_volumes-gce.go index f0e8dbc0c55..e417b5c3a77 100644 --- a/test/e2e/storage/persistent_volumes-gce.go +++ b/test/e2e/storage/persistent_volumes-gce.go @@ -51,7 +51,7 @@ func initializeGCETestSpec(c clientset.Interface, ns string, pvConfig framework. } // Testing configurations of single a PV/PVC pair attached to a GCE PD -var _ = SIGDescribe("PersistentVolumes:GCEPD [Volume]", func() { +var _ = SIGDescribe("PersistentVolumes:GCEPD", func() { var ( c clientset.Interface diskName string diff --git a/test/e2e/storage/persistent_volumes.go b/test/e2e/storage/persistent_volumes.go index f8f7f005c5f..b0827e15621 100644 --- a/test/e2e/storage/persistent_volumes.go +++ b/test/e2e/storage/persistent_volumes.go @@ -287,7 +287,7 @@ var _ = SIGDescribe("PersistentVolumes", func() { // This It() tests a scenario where a PV is written to by a Pod, recycled, then the volume checked // for files. If files are found, the checking Pod fails, failing the test. Otherwise, the pod // (and test) succeed. - It("should test that a PV becomes Available and is clean after the PVC is deleted. [Volume]", func() { + It("should test that a PV becomes Available and is clean after the PVC is deleted.", func() { By("Writing to the volume.") pod := framework.MakeWritePod(ns, pvc) pod, err = c.CoreV1().Pods(ns).Create(pod) diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go index c5cc261e2f7..fc7f55e92a4 100644 --- a/test/e2e/storage/volume_provisioning.go +++ b/test/e2e/storage/volume_provisioning.go @@ -224,7 +224,7 @@ var _ = SIGDescribe("Dynamic Provisioning", func() { }) SIGDescribe("DynamicProvisioner", func() { - It("should provision storage with different parameters [Slow] [Volume]", func() { + It("should provision storage with different parameters [Slow]", func() { cloudZone := getRandomCloudZone(c) // This test checks that dynamic provisioning can provision a volume @@ -409,7 +409,7 @@ var _ = SIGDescribe("Dynamic Provisioning", func() { // NOTE: Slow! The test will wait up to 5 minutes (framework.ClaimProvisionTimeout) // when there is no regression. - It("should not provision a volume in an unmanaged GCE zone. [Slow] [Volume]", func() { + It("should not provision a volume in an unmanaged GCE zone. [Slow]", func() { framework.SkipUnlessProviderIs("gce", "gke") var suffix string = "unmananged" @@ -467,7 +467,7 @@ var _ = SIGDescribe("Dynamic Provisioning", func() { framework.Logf(err.Error()) }) - It("should test that deleting a claim before the volume is provisioned deletes the volume. [Volume]", func() { + It("should test that deleting a claim before the volume is provisioned deletes the volume.", func() { // This case tests for the regressions of a bug fixed by PR #21268 // REGRESSION: Deleting the PVC before the PV is provisioned can result in the PV // not being deleted. @@ -518,7 +518,7 @@ var _ = SIGDescribe("Dynamic Provisioning", func() { }) SIGDescribe("DynamicProvisioner External", func() { - It("should let an external dynamic provisioner create and delete persistent volumes [Slow] [Volume]", func() { + It("should let an external dynamic provisioner create and delete persistent volumes [Slow]", func() { // external dynamic provisioner pods need additional permissions provided by the // persistent-volume-provisioner role framework.BindClusterRole(c.Rbac(), "system:persistent-volume-provisioner", ns, @@ -556,7 +556,7 @@ var _ = SIGDescribe("Dynamic Provisioning", func() { }) SIGDescribe("DynamicProvisioner Default", func() { - It("should create and delete default persistent volumes [Slow] [Volume]", func() { + It("should create and delete default persistent volumes [Slow]", func() { framework.SkipUnlessProviderIs("openstack", "gce", "aws", "gke", "vsphere", "azure") By("creating a claim with no annotation") @@ -570,7 +570,7 @@ var _ = SIGDescribe("Dynamic Provisioning", func() { }) // Modifying the default storage class can be disruptive to other tests that depend on it - It("should be disabled by changing the default annotation[Slow] [Serial] [Disruptive] [Volume]", func() { + It("should be disabled by changing the default annotation[Slow] [Serial] [Disruptive]", func() { framework.SkipUnlessProviderIs("openstack", "gce", "aws", "gke", "vsphere", "azure") scName := getDefaultStorageClassName(c) test := storageClassTest{ @@ -601,7 +601,7 @@ var _ = SIGDescribe("Dynamic Provisioning", func() { }) // Modifying the default storage class can be disruptive to other tests that depend on it - It("should be disabled by removing the default annotation[Slow] [Serial] [Disruptive] [Volume]", func() { + It("should be disabled by removing the default annotation[Slow] [Serial] [Disruptive]", func() { framework.SkipUnlessProviderIs("openstack", "gce", "aws", "gke", "vsphere", "azure") scName := getDefaultStorageClassName(c) test := storageClassTest{ diff --git a/test/e2e/storage/volumes.go b/test/e2e/storage/volumes.go index 60cba830feb..df605150a5b 100644 --- a/test/e2e/storage/volumes.go +++ b/test/e2e/storage/volumes.go @@ -79,7 +79,7 @@ func DeleteCinderVolume(name string) error { } // These tests need privileged containers, which are disabled by default. -var _ = SIGDescribe("Volumes [Volume]", func() { +var _ = SIGDescribe("Volumes", func() { f := framework.NewDefaultFramework("volume") // If 'false', the test won't clear its volumes upon completion. Useful for debugging, diff --git a/test/e2e/storage/vsphere_volume_fstype.go b/test/e2e/storage/vsphere_volume_fstype.go index 438f410f42e..ba1c86a47a7 100644 --- a/test/e2e/storage/vsphere_volume_fstype.go +++ b/test/e2e/storage/vsphere_volume_fstype.go @@ -45,7 +45,7 @@ import ( 9. Delete PVC, PV and Storage Class. */ -var _ = SIGDescribe("vsphere Volume fstype [Volume]", func() { +var _ = SIGDescribe("vsphere Volume fstype", func() { f := framework.NewDefaultFramework("volume-fstype") var ( client clientset.Interface diff --git a/test/e2e/storage/vsphere_volume_ops_storm.go b/test/e2e/storage/vsphere_volume_ops_storm.go index 6a61d5f6139..a93a395be48 100644 --- a/test/e2e/storage/vsphere_volume_ops_storm.go +++ b/test/e2e/storage/vsphere_volume_ops_storm.go @@ -47,7 +47,7 @@ import ( 10. Delete storage class. */ -var _ = SIGDescribe("vsphere volume operations storm [Volume]", func() { +var _ = SIGDescribe("vsphere volume operations storm", func() { f := framework.NewDefaultFramework("volume-ops-storm") const DEFAULT_VOLUME_OPS_SCALE = 30 var ( diff --git a/test/e2e/storage/vsphere_volume_placement.go b/test/e2e/storage/vsphere_volume_placement.go index 52ec45adb14..07207547f60 100644 --- a/test/e2e/storage/vsphere_volume_placement.go +++ b/test/e2e/storage/vsphere_volume_placement.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" ) -var _ = SIGDescribe("Volume Placement [Volume]", func() { +var _ = SIGDescribe("Volume Placement", func() { f := framework.NewDefaultFramework("volume-placement") var ( c clientset.Interface diff --git a/test/e2e/storage/vsphere_volume_vsan_policy.go b/test/e2e/storage/vsphere_volume_vsan_policy.go index 66f13dab096..a2374eb83ec 100644 --- a/test/e2e/storage/vsphere_volume_vsan_policy.go +++ b/test/e2e/storage/vsphere_volume_vsan_policy.go @@ -83,7 +83,7 @@ const ( 8. Delete PVC, PV and Storage Class */ -var _ = SIGDescribe("vSphere Storage policy support for dynamic provisioning [Volume]", func() { +var _ = SIGDescribe("vSphere Storage policy support for dynamic provisioning", func() { f := framework.NewDefaultFramework("volume-vsan-policy") var ( client clientset.Interface