Skip to content

Commit deb477e

Browse files
Removing failing block and file vanilla tests from EF (#3702)
1 parent 0f8ae8d commit deb477e

11 files changed

+25
-25
lines changed

tests/e2e/csi_snapshot_basic.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
22782278
10. Verify if the new pod attaches to the PV created in step-8
22792279
11. Cleanup the sts and the snapshot + pv that was left behind in step-7
22802280
*/
2281-
ginkgo.It("[ef-vanilla-block][ef-f-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot]"+
2281+
ginkgo.It("[ef-f-vanilla-block][ef-f-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot]"+
22822282
"[supervisor-snapshot][ef-vks-snapshot-f] Snapshot workflow for "+
22832283
"statefulsets", ginkgo.Label(p0, block, vanilla, snapshot, wcp,
22842284
tkg, vc80), func() {
@@ -4258,7 +4258,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
42584258
7. Verify pvcs all are in Bound state.
42594259
8. Cleanup all the snapshots and the pvc.
42604260
*/
4261-
ginkgo.It("[ef-vanilla-block][ef-f-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
4261+
ginkgo.It("[ef-f-vanilla-block][ef-f-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
42624262
"[ef-vks-snapshot-f] Multi-master and snapshot workflow", ginkgo.Label(p1, block, vanilla,
42634263
tkg, snapshot, vc80), func() {
42644264
ctx, cancel := context.WithCancel(context.Background())
@@ -4529,7 +4529,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
45294529
5. Validate creation of additional snapshots beyond the configured
45304530
max-snapshots per volume fails - check error returned
45314531
*/
4532-
ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot] Max Snapshots per volume test", ginkgo.Label(p1, block,
4532+
ginkgo.It("[ef-f-vanilla-block][block-vanilla-snapshot] Max Snapshots per volume test", ginkgo.Label(p1, block,
45334533
vanilla, snapshot, vc80), func() {
45344534

45354535
ctx, cancel := context.WithCancel(context.Background())
@@ -4910,7 +4910,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
49104910
3. Cleanup of snapshot, pvc and sc
49114911
*/
49124912

4913-
ginkgo.It("[ef-vanilla-block][pq-wcp-snpt][block-vanilla-snapshot][tkg-snapshot]"+
4913+
ginkgo.It("[ef-f-vanilla-block][pq-wcp-snpt][block-vanilla-snapshot][tkg-snapshot]"+
49144914
"[supervisor-snapshot][ef-vks-snapshot-f] Volume provision and snapshot creation/restore "+
49154915
"on VMFS Datastore", ginkgo.Label(p0, block, vanilla, snapshot, tkg, vc80), func() {
49164916
ctx, cancel := context.WithCancel(context.Background())

tests/e2e/csi_static_provisioning_file_basic.go

Lines changed: 1 addition & 1 deletion
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("[ef-file-vanilla] Verify basic static provisioning workflow for file volume", ginkgo.Label(p1,
113+
ginkgo.It("[ef-f-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())

tests/e2e/file_volume_statefulsets.go

Lines changed: 2 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("[ef-file-vanilla] Statefulset with file volume testing scale-up first and "+
426+
ginkgo.It("[ef-f-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,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] File Volume statefulset", func() {
738738
10. Increase the CSI driver replica to 3
739739
740740
*/
741-
ginkgo.It("[ef-file-vanilla] List-volumeResponseFor-fileVolumes", ginkgo.Label(p1, listVolume,
741+
ginkgo.It("[ef-f-file-vanilla] List-volumeResponseFor-fileVolumes", ginkgo.Label(p1, listVolume,
742742
file, vanilla, core, vc80), func() {
743743
curtime := time.Now().Unix()
744744
randomValue := rand.Int()

tests/e2e/labelupdates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelize
120120
}
121121
})
122122

123-
ginkgo.It("[ef-vanilla-block][cf-wcp] [csi-supervisor] verify labels are created in CNS after updating pvc "+
123+
ginkgo.It("[ef-f-vanilla-block][cf-wcp] [csi-supervisor] verify labels are created in CNS after updating pvc "+
124124
"and/or pv with new labels", ginkgo.Label(p1, block, vanilla, windows, wcp,
125125
core), func() {
126126
ginkgo.By("Invoking test to verify labels creation")

tests/e2e/policy_driven_vol_allocation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
11581158
11 Delete the SC created in step 2
11591159
12 Deleted the SPBM policy created in step 1
11601160
*/
1161-
ginkgo.It("[ef-vanilla-block][ef-f-svc-volallowcation][csi-block-vanilla][csi-guest][csi-supervisor]"+
1161+
ginkgo.It("[ef-f-vanilla-block][ef-f-svc-volallowcation][csi-block-vanilla][csi-guest][csi-supervisor]"+
11621162
"[ef-vks-thickthin][csi-wcp-vsan-direct] Verify online LZT/EZT volume expansion of attached volumes with "+
11631163
"IO", ginkgo.Label(p0, vanilla, block, thickThin, wcp, tkg, stable, vsanDirect, vc70), func() {
11641164

@@ -2141,7 +2141,7 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
21412141
14 Delete the SCs created in step 2
21422142
15 Delete the SPBM policies created in step 1
21432143
*/
2144-
ginkgo.It("[ef-vanilla-block][csi-block-vanilla] verify volume allocation change post snapshot deletion works"+
2144+
ginkgo.It("[ef-f-vanilla-block][csi-block-vanilla] verify volume allocation change post snapshot deletion works"+
21452145
" fine", ginkgo.Label(p0, vanilla, block, thickThin, stable, vc70), func() {
21462146

21472147
ctx, cancel := context.WithCancel(context.Background())

tests/e2e/storagepolicy.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ var _ = ginkgo.Describe("Storage Policy Based Volume Provisioning", func() {
114114
namespace, scParameters, storagePolicyNameForSharedDatastores)
115115
})
116116

117-
ginkgo.It("[ef-vanilla-block][ef-wcp][csi-block-vanilla][csi-block-vanilla-parallelized][csi-supervisor][csi-guest]"+
118-
"[ef-vks][ef-vks-n1][ef-vks-n2] Verify dynamic volume provisioning fails when storage policy specified "+
119-
"in the storageclass is compliant for non-shared datastores", func() {
117+
ginkgo.It("[ef-f-vanilla-block][ef-wcp][csi-block-vanilla][csi-block-vanilla-parallelized][csi-supervisor]"+
118+
"[csi-guest][ef-vks][ef-vks-n1][ef-vks-n2] Verify dynamic volume provisioning fails when storage policy "+
119+
"specified in the storageclass is compliant for non-shared datastores", func() {
120120
storagePolicyNameForNonSharedDatastores := GetAndExpectStringEnvVar(envStoragePolicyNameForNonSharedDatastores)
121121
ginkgo.By(fmt.Sprintf("Invoking test for storage policy: %s", storagePolicyNameForNonSharedDatastores))
122122
scParameters := make(map[string]string)

tests/e2e/svmotion_volumes.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Re
104104
})
105105

106106
// Test for relocating volume being detached state
107-
ginkgo.It("[ef-vanilla-block] Verify relocating detached volume works fine", ginkgo.Label(p0, vanilla, block, core,
108-
vc70), func() {
107+
ginkgo.It("[ef-f-vanilla-block] Verify relocating detached volume works fine", ginkgo.Label(p0, vanilla, block,
108+
core, vc70), func() {
109109
ginkgo.By("Invoking Test for relocating detached volume")
110110
ctx, cancel := context.WithCancel(context.Background())
111111
defer cancel()
@@ -499,7 +499,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Re
499499
10. Verify online volume expansion is successful.
500500
11. Delete all the objects created during the test.
501501
*/
502-
ginkgo.It("[ef-vanilla-block][csi-block-vanilla][csi-block-vanilla-parallelized] Start attached volume's "+
502+
ginkgo.It("[ef-f-vanilla-block][csi-block-vanilla][csi-block-vanilla-parallelized] Start attached volume's "+
503503
"relocation and then expand it", ginkgo.Label(p0, vanilla, block, core, vc70), func() {
504504

505505
ctx, cancel := context.WithCancel(context.Background())
@@ -722,7 +722,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Re
722722
10. Verify online volume expansion is successful.
723723
11. Delete all the objects created during the test.
724724
*/
725-
ginkgo.It("[ef-vanilla-block][csi-block-vanilla][csi-block-vanilla-parallelized] Start attached volume's"+
725+
ginkgo.It("[ef-f-vanilla-block][csi-block-vanilla][csi-block-vanilla-parallelized] Start attached volume's"+
726726
"expansion and then relocate it", ginkgo.Label(p1, vanilla, block, core, vc70), func() {
727727

728728
ctx, cancel := context.WithCancel(context.Background())

tests/e2e/vsphere_file_volume_basic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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] [ef-file-vanilla]verify dynamic volume provisioning fails for VSAN datastore "+
162+
ginkgo.It("[csi-file-vanilla] [ef-f-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: 5 additions & 5 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] [ef-file-vanilla] Verify Two Pods can read the files written by each other, "+
83+
ginkgo.It("[csi-file-vanilla] [ef-f-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] [ef-file-vanilla]Verify Pod can read the files written by other Pod, "+
108+
ginkgo.It("[csi-file-vanilla] [ef-f-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,7 +129,7 @@ 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] [ef-file-vanilla]Verify Pod can read the files written by other Pod"+
132+
ginkgo.It("[csi-file-vanilla] [ef-f-file-vanilla]Verify Pod can read the files written by other Pod"+
133133
" 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
})
@@ -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] [ef-file-vanilla]Verify Pod can read the files written by other Pod, "+
156+
ginkgo.It("[csi-file-vanilla] [ef-f-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)
@@ -216,7 +216,7 @@ 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] [ef-file-vanilla]Verify mounting of volume for RWX PVC with ext4 fstype"+
219+
ginkgo.It("[csi-file-vanilla] [ef-f-file-vanilla]Verify mounting of volume for RWX PVC with ext4 fstype"+
220220
" passes", ginkgo.Label(p0,
221221
file, vanilla, vc70), func() {
222222
ctx, cancel := context.WithCancel(context.Background())

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] [ef-file-vanilla]verify dynamic provisioning with ReadWriteMany access mode "+
139+
ginkgo.It("[csi-file-vanilla] [ef-f-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())

0 commit comments

Comments
 (0)