Skip to content

Commit d8354a0

Browse files
Adding ef labels to file vanilla tests (#3591)
1 parent 6098772 commit d8354a0

8 files changed

+23
-21
lines changed

tests/e2e/csi_static_provisioning_file_basic.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Basic File Volume Static Provisionin
110110
// 8. Delete POD.
111111
// 9. Delete PVC.
112112
// 10. Verify PV is deleted automatically.
113-
ginkgo.It("Verify basic static provisioning workflow for file volume", ginkgo.Label(p1,
113+
ginkgo.It("[ef-file-vanilla] Verify basic static provisioning workflow for file volume", ginkgo.Label(p1,
114114
file, vanilla, vc70), func() {
115115

116116
ctx, cancel := context.WithCancel(context.Background())
@@ -215,8 +215,8 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Basic File Volume Static Provisionin
215215
// 7. Wait for the volume entry to be created in CNS.
216216
// 8. Delete PV2.
217217
// 9. Wait for PV2 to be deleted, and also entry is deleted from CNS.
218-
ginkgo.It("Verify static provisioning for file volume workflow using same PV name twice", ginkgo.Label(p1,
219-
file, vanilla, vc70), func() {
218+
ginkgo.It("[ef-file-vanilla] Verify static provisioning for file volume workflow using"+
219+
" same PV name twice", ginkgo.Label(p1, file, vanilla, vc70), func() {
220220

221221
ctx, cancel := context.WithCancel(context.Background())
222222
defer cancel()

tests/e2e/file_volume_statefulsets.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] File Volume statefulset", func() {
423423
7. Delete all PVCs from the tests namespace.
424424
8. Delete the storage class.
425425
*/
426-
ginkgo.It("Statefulset with file volume testing scale-up first and "+
426+
ginkgo.It("[ef-file-vanilla] Statefulset with file volume testing scale-up first and "+
427427
"scale-down", ginkgo.Label(p0, file, vanilla, core, vc70), func() {
428428
curtime := time.Now().Unix()
429429
randomValue := rand.Int()
@@ -738,7 +738,8 @@ var _ = ginkgo.Describe("[csi-file-vanilla] File Volume statefulset", func() {
738738
10. Increase the CSI driver replica to 3
739739
740740
*/
741-
ginkgo.It("List-volumeResponseFor-fileVolumes", ginkgo.Label(p1, listVolume, file, vanilla, core, vc80), func() {
741+
ginkgo.It("[ef-file-vanilla] List-volumeResponseFor-fileVolumes", ginkgo.Label(p1, listVolume,
742+
file, vanilla, core, vc80), func() {
742743
curtime := time.Now().Unix()
743744
randomValue := rand.Int()
744745
val := strconv.FormatInt(int64(randomValue), 10)

tests/e2e/fullsync_test_for_file_volume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ var _ bool = ginkgo.Describe("[csi-file-vanilla] Full sync test for file volume"
103103
// 10. Verify pv and pvc label has been updated.
104104
// 11. Delete PVC.
105105
// 12. Delete Storage class.
106-
ginkgo.It("verify labels are created in CNS after updating pvc and/or pv with new"+
106+
ginkgo.It("[ef-file-vanilla] verify labels are created in CNS after updating pvc and/or pv with new"+
107107
" labels for file volume", ginkgo.Label(p0, file, vanilla, vc70), func() {
108108
ginkgo.By("Invoking test to verify labels creation")
109109
scParameters := make(map[string]string)

tests/e2e/volume_health_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2693,7 +2693,7 @@ var _ = ginkgo.Describe("Volume health check", func() {
26932693
// Verify PV entry is deleted from CNS.
26942694
// Delete the SC.
26952695

2696-
ginkgo.It("[csi-file-vanilla] File Vanilla Verify pvc is not annotated with health "+
2696+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]File Vanilla Verify pvc is not annotated with health "+
26972697
"status", ginkgo.Label(p1, file, vanilla, core, vc70), func() {
26982698
ctx, cancel := context.WithCancel(context.Background())
26992699
defer cancel()

tests/e2e/vsphere_file_volume_basic.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Basic Testing", func() {
8989
7. Delete PVC
9090
8. Delete Storage class
9191
*/
92-
ginkgo.It("[csi-file-vanilla] verify dynamic provisioning with ReadWriteMany access mode with "+
92+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla] verify dynamic provisioning with ReadWriteMany access mode with "+
9393
"datastoreURL is set in storage class, when no storage policy is offered", func() {
9494
datastoreURL := GetAndExpectStringEnvVar(envSharedDatastoreURL)
9595
testHelperForCreateFileVolumeWithDatastoreURLInSC(f, client, namespace, v1.ReadWriteMany, datastoreURL, false)
@@ -105,7 +105,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Basic Testing", func() {
105105
5. Delete PVC
106106
6. Delete Storage class
107107
*/
108-
ginkgo.It("[csi-file-vanilla] verify dynamic provisioning with ReadWriteMany access mode with "+
108+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]verify dynamic provisioning with ReadWriteMany access mode with "+
109109
"datastoreURL specified in storage class is a non-VSAN datastore, when no storage policy is "+
110110
"offered", ginkgo.Label(p1, negative, file, vanilla, vc70), func() {
111111
nonVSANDatastoreURL := GetAndExpectStringEnvVar(envNonSharedStorageClassDatastoreURL)
@@ -140,7 +140,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Basic Testing", func() {
140140
5. Delete PVC
141141
6. Delete Storage class
142142
*/
143-
ginkgo.It("[csi-file-vanilla] verify dynamic volume provisioning fails for VSAN datastore "+
143+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]verify dynamic volume provisioning fails for VSAN datastore "+
144144
"specified in sc.datastoreUrl but doesn't have VSAN FS enabled", ginkgo.Label(p1,
145145
negative, file, vanilla, vc70), func() {
146146
datastoreURL := os.Getenv(envFileServiceDisabledSharedDatastoreURL)
@@ -159,7 +159,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Basic Testing", func() {
159159
5. Delete PVC
160160
6. Delete Storage class
161161
*/
162-
ginkgo.It("[csi-file-vanilla] verify dynamic volume provisioning fails for VSAN datastore "+
162+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]verify dynamic volume provisioning fails for VSAN datastore "+
163163
"in datacenter doesn't have VSAN FS enabled", ginkgo.Label(p1, negative, file, vanilla, vc70), func() {
164164
testHelperForCreateFileVolumeFailWhenFileServiceIsDisabled(f, client, namespace, v1.ReadWriteMany, "")
165165
})

tests/e2e/vsphere_file_volume_basic_mount.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Verify Two Pods can read write files
8080
Cleanup:
8181
1. Delete all the Pods, pvcs and storage class and verify the deletion
8282
*/
83-
ginkgo.It("[csi-file-vanilla] Verify Two Pods can read the files written by each other, "+
83+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla] Verify Two Pods can read the files written by each other, "+
8484
"when both have same pvc mounted", ginkgo.Label(p0, file, vanilla, vc70), func() {
8585
invokeTestForCreateFileVolumeAndMount(f, client,
8686
namespace, accessMode, filePath1, filePath2, false, false, false)
@@ -105,7 +105,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Verify Two Pods can read write files
105105
Cleanup:
106106
1. Delete all the Pods, pvcs and storage class and verify the deletion
107107
*/
108-
ginkgo.It("[csi-file-vanilla] Verify Pod can read the files written by other Pod, "+
108+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]Verify Pod can read the files written by other Pod, "+
109109
"which is deleted, when both have same pvc mounted", ginkgo.Label(p0, file, vanilla, vc70), func() {
110110
invokeTestForCreateFileVolumeAndMount(f, client, namespace, accessMode, filePath1, filePath2,
111111
true, false, false)
@@ -129,8 +129,8 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Verify Two Pods can read write files
129129
Cleanup:
130130
1. Delete all the Pods, pvcs and storage class and verify the deletion
131131
*/
132-
ginkgo.It("[csi-file-vanilla] Verify Pod can read the files written by other Pod created as root user, "+
133-
"when both have same pvc mounted", ginkgo.Label(p0, file, vanilla, vc70), func() {
132+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]Verify Pod can read the files written by other Pod"+
133+
" created as root user, when both have same pvc mounted", ginkgo.Label(p0, file, vanilla, vc70), func() {
134134
invokeTestForCreateFileVolumeAndMount(f, client, namespace, accessMode, filePath1, filePath2, false, true, false)
135135
})
136136

@@ -153,7 +153,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Verify Two Pods can read write files
153153
Cleanup:
154154
1. Delete all the Pods, pvcs and storage class and verify the deletion
155155
*/
156-
ginkgo.It("[csi-file-vanilla] Verify Pod can read the files written by other Pod, "+
156+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]Verify Pod can read the files written by other Pod, "+
157157
"which is deleted, when the Pod has pvc statically provisoned on same vsan file share", ginkgo.Label(p0,
158158
file, vanilla, vc70), func() {
159159
invokeTestForCreateFileVolumeAndMount(f, client, namespace, accessMode, filePath1, filePath2, true, false, true)
@@ -167,8 +167,8 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Verify Two Pods can read write files
167167
Cleanup:
168168
1.Delete all the pvcs and storage class and verify the deletion
169169
*/
170-
ginkgo.It("[csi-file-vanilla] Verify provisioning of PVC fails for RWX PVC with xfs fstype", ginkgo.Label(p1,
171-
negative, file, vanilla, vc70), func() {
170+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]Verify provisioning of PVC fails for RWX PVC with"+
171+
" xfs fstype", ginkgo.Label(p1, negative, file, vanilla, vc70), func() {
172172
ctx, cancel := context.WithCancel(context.Background())
173173
defer cancel()
174174

@@ -216,7 +216,8 @@ var _ = ginkgo.Describe("[csi-file-vanilla] Verify Two Pods can read write files
216216
Cleanup:
217217
1.Delete all the Pods, pvcs and storage class and verify the deletion
218218
*/
219-
ginkgo.It("[csi-file-vanilla] Verify mounting of volume for RWX PVC with ext4 fstype passes", ginkgo.Label(p0,
219+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]Verify mounting of volume for RWX PVC with ext4 fstype"+
220+
" passes", ginkgo.Label(p0,
220221
file, vanilla, vc70), func() {
221222
ctx, cancel := context.WithCancel(context.Background())
222223
defer cancel()

tests/e2e/vsphere_file_volume_storagepolicy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] File Volume Provision Testing With S
136136
7. Delete Storage class
137137
*/
138138

139-
ginkgo.It("[csi-file-vanilla] verify dynamic provisioning with ReadWriteMany access mode "+
139+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]verify dynamic provisioning with ReadWriteMany access mode "+
140140
"when storage policy has non-vSAN compliant datastores", ginkgo.Label(p1,
141141
negative, file, vanilla, vc70), func() {
142142
ctx, cancel := context.WithCancel(context.Background())

tests/e2e/vsphere_volume_expansion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
292292
// 4. Wait for PVC's status to become Bound.
293293
// 5. Modify PVC's size to a bigger size.
294294
// 6. Verify if the PVC expansion fails.
295-
ginkgo.It("[csi-file-vanilla] Verify file volume expansion is not "+
295+
ginkgo.It("[csi-file-vanilla] [ef-file-vanilla]Verify file volume expansion is not "+
296296
"supported", ginkgo.Label(p1, file, vanilla, core, vc70), func() {
297297
invokeTestForUnsupportedFileVolumeExpansion(f, client, namespace, storagePolicyName, profileID)
298298
})

0 commit comments

Comments
 (0)