ef tag addition for block vanilla tests (#3593)

Author: rajguptavm

tests/e2e/csi_snapshot_basic.go

@@ -520,7 +520,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		11. The snapshot that was created via CNS in step-2 should be deleted as part of k8s snapshot delete
 		12. Delete the pvc
 	*/
-	ginkgo.It("[block-vanilla-snapshot] Verify snapshot static provisioning "+
+	ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot] Verify snapshot static provisioning "+
 		"via CNS", ginkgo.Label(p0, block, vanilla, snapshot, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -842,7 +842,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		9. Query the Snasphot from CNS side using the volumeId
 		10. Cleanup the snapshot and delete the volume
 	*/
-	ginkgo.It("[block-vanilla-snapshot] Verify snapshot static provisioning with deletion "+
+	ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot] Verify snapshot static provisioning with deletion "+
 		"policy Retain - test2", ginkgo.Label(p0, block, vanilla, snapshot, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -1958,7 +1958,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 			designed to return success even though it cannot find a snapshot in the backend)
 	*/
 
-	ginkgo.It("[cf-wcp] [block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot]"+
+	ginkgo.It("[ef-vanilla-block][cf-wcp][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
 		"[ef-vks-cnapshot] Delete a non-existent snapshot", ginkgo.Label(p0, block, vanilla,
 		wcp, snapshot, tkg, negative, vc90), func() {
 
@@ -2143,8 +2143,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		4. Create with exact size and ensure it succeeds
 	*/
 
-	ginkgo.It("[cf-wcp][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot] Create Volume from snapshot with "+
-		"different size", ginkgo.Label(p1, block, vanilla, snapshot, tkg, wcp, stable, negative, vc90), func() {
+	ginkgo.It("[ef-vanilla-block][cf-wcp][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot] Create Volume "+
+		"from snapshot with different size", ginkgo.Label(p1, block, vanilla, snapshot, tkg, wcp, stable, negative,
+		vc90), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -2276,9 +2277,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 	   10. Verify if the new pod attaches to the PV created in step-8
 	   11. Cleanup the sts and the snapshot + pv that was left behind in step-7
 	*/
-	ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot]"+
-		"[supervisor-snapshot] [ef-vks-snapshot] Snapshot workflow for "+
-		"statefulsets", ginkgo.Label(p0, block, vanilla, snapshot, wcp, tkg, vc80), func() {
+	ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
+		"[ef-vks-snapshot] Snapshot workflow for statefulsets", ginkgo.Label(p0, block, vanilla, snapshot, wcp,
+		tkg, vc80), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		quota := make(map[string]*resource.Quantity)
@@ -2534,8 +2535,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		5. Expect VolumeFailedDelete error with an appropriate err-msg
 		6. Run cleanup - delete the snapshots and then delete pv
 	*/
-	ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot] Volume deletion with"+
-		"existing snapshots", ginkgo.Label(p0, block, vanilla, snapshot, tkg, wcp, stable, negative, vc80), func() {
+	ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot] Volume "+
+		"deletion with existing snapshots", ginkgo.Label(p0, block, vanilla, snapshot, tkg, wcp, stable, negative,
+		vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -2628,8 +2630,8 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		4. create a pre-provisioned snapshot (which uses VolumeSnapshotContent as source) using the VSC from step(3)
 		5. Ensure this provisioning fails with appropriate error: SnapshotContentMismatch error
 	*/
-	ginkgo.It("[block-vanilla-snapshot] [tkg-snapshot][ef-vks-snapshot] Create a pre-provisioned snapshot using "+
-		"VolumeSnapshotContent as source", ginkgo.Label(p1, block, vanilla, snapshot, tkg, stable,
+	ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot][tkg-snapshot][ef-vks-snapshot] Create a pre-provisioned "+
+		"snapshot using VolumeSnapshotContent as source", ginkgo.Label(p1, block, vanilla, snapshot, tkg, stable,
 		negative, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -2729,7 +2731,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 	       (note the snapshotHandle its pointing to has been deleted)
 	   9. Volume Create should fail with an appropriate error on k8s side
 	*/
-	ginkgo.It("[block-vanilla-snapshot] Pre-provisioned snapshot using incorrect/non-existing "+
+	ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot] Pre-provisioned snapshot using incorrect/non-existing "+
 		"static snapshot", ginkgo.Label(p0, block, vanilla, snapshot, negative, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -2886,7 +2888,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		7. Validate the pvc is Bound
 		8. Cleanup the snapshot and pvc
 	*/
-	ginkgo.It("[block-vanilla-snapshot] Create a volume from a snapshot that is still not "+
+	ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot] Create a volume from a snapshot that is still not "+
 		"ready-to-use", ginkgo.Label(p0, block, vanilla, snapshot, stable, negative, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -3361,8 +3363,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		6. Run resize and it should succeed
 		7. Cleanup the pvc
 	*/
-	ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot] Volume online resize of "+
-		"a volume having snapshots", ginkgo.Label(p0, block, vanilla, tkg, snapshot, stable, negative, vc90), func() {
+	ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot] Volume "+
+		"online resize of a volume having snapshots", ginkgo.Label(p0, block, vanilla, tkg, snapshot, stable, negative,
+		vc90), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -4253,7 +4256,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 	   8. Cleanup all the snapshots and the pvc.
 	*/
 
-	ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
+	ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
 		"[ef-vks-snapshot] Multi-master and snapshot workflow", ginkgo.Label(p1, block, vanilla,
 		tkg, snapshot, vc80), func() {
 
@@ -4525,7 +4528,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 	   5. Validate creation of additional snapshots beyond the configured
 	       max-snapshots per volume fails - check error returned
 	*/
-	ginkgo.It("[block-vanilla-snapshot] Max Snapshots per volume test", ginkgo.Label(p1, block,
+	ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot] Max Snapshots per volume test", ginkgo.Label(p1, block,
 		vanilla, snapshot, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -4907,8 +4910,8 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		3. Cleanup of snapshot, pvc and sc
 	*/
 
-	ginkgo.It("[pq-wcp-snpt][block-vanilla-snapshot][tkg-snapshot] [supervisor-snapshot] Volume provision and "+
-		"snapshot creation/restore on VMFS Datastore", ginkgo.Label(p0, block, vanilla, snapshot,
+	ginkgo.It("[ef-vanilla-block][pq-wcp-snpt][block-vanilla-snapshot][tkg-snapshot] [supervisor-snapshot] Volume "+
+		"provision and snapshot creation/restore on VMFS Datastore", ginkgo.Label(p0, block, vanilla, snapshot,
 		tkg, vc80), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -4921,7 +4924,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		2. Create Snapshot class and take a snapshot of the volume
 		3. Cleanup of snapshot, pvc and sc
 	*/
-	ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot] [supervisor-snapshot]"+
+	ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot] [supervisor-snapshot]"+
 		"[ef-vks-snapshot] Volume provision and snapshot creation/restore on NFS Datastore", ginkgo.Label(p0,
 		block, vanilla, snapshot, tkg, vc80), func() {
 		ctx, cancel := context.WithCancel(context.Background())
@@ -4964,9 +4967,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 	   4. Volume restore
 	   5. snapshot create/delete workflow
 	*/
-	ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot][ef-vks-snapshot] Scale-up "+
-		"creation of snapshots across multiple volumes", ginkgo.Label(p1, block, vanilla, snapshot,
-		tkg, stable, vc80), func() {
+	ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
+		"[ef-vks-snapshot] Scale-up creation of snapshots across multiple volumes", ginkgo.Label(p1, block, vanilla,
+		snapshot, tkg, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/csi_static_provisioning_basic.go

@@ -267,8 +267,8 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 	// 9. Verify volume is detached from the node.
 	// 10. Delete PVC.
 	// 11. Verify PV is deleted automatically.
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-parallelized] Verify basic static provisioning "+
-		"workflow", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
+	ginkgo.It("[ef-vanilla-block][csi-block-vanilla] [csi-block-vanilla-parallelized] Verify basic static "+
+		"provisioning workflow", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
 		var err error
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -376,8 +376,8 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 	// 9. Verify volume is detached from the node.
 	// 10. Delete PVC.
 	// 11. Verify PV is deleted automatically.
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-parallelized] Verify basic static provisioning workflow "+
-		"with XFS filesystem", ginkgo.Label(p1, block, vanilla, core, vc70), func() {
+	ginkgo.It("[ef-vanilla-block][csi-block-vanilla][csi-block-vanilla-parallelized] Verify basic static provisioning"+
+		" workflow with XFS filesystem", ginkgo.Label(p1, block, vanilla, core, vc70), func() {
 		var err error
 
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/data_persistence.go

@@ -304,8 +304,8 @@ var _ = ginkgo.Describe("Data Persistence", func() {
 	// 10. Delete pod.
 	// 11. Wait for volume to be detached.
 	// 12. Delete PVC and SC.
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-parallelized] Dynamic volume provisioning data persistence "+
-		"test with XFS filesystem", ginkgo.Label(p0, block, vanilla, wcp, core, vc70), func() {
+	ginkgo.It("[ef-vanilla-block][csi-block-vanilla][csi-block-vanilla-parallelized] Dynamic volume provisioning data"+
+		" persistence test with XFS filesystem", ginkgo.Label(p0, block, vanilla, wcp, core, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		var sc *storagev1.StorageClass

tests/e2e/fullsync_test_for_block_volume.go

@@ -134,8 +134,8 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 		}
 	})
 
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-serialized] Verify CNS volume is created after "+
-		"full sync when pv entry is present", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
+	ginkgo.It("[ef-vanilla-block][csi-block-vanilla] [csi-block-vanilla-serialized] Verify CNS volume is created "+
+		"after full sync when pv entry is present", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
 		var err error
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -209,8 +209,8 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 
 	})
 
-	ginkgo.It("[ef-wcp][csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify labels are created "+
-		"in CNS after updating pvc and/or pv with new labels", ginkgo.Label(p0, block, vanilla, wcp, core,
+	ginkgo.It("[ef-vanilla-block][csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify labels "+
+		"are created in CNS after updating pvc and/or pv with new labels", ginkgo.Label(p0, block, vanilla, wcp, core,
 		vc70), func() {
 		ginkgo.By("Invoking test to verify labels creation")
 		var sc *storagev1.StorageClass
@@ -298,8 +298,9 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 
 	})
 
-	ginkgo.It("[ef-wcp][csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify CNS volume is "+
-		"deleted after full sync when pv entry is delete", ginkgo.Label(p0, block, vanilla, wcp, core, vc70), func() {
+	ginkgo.It("[ef-vanilla-block][ef-wcp][csi-supervisor] [csi-block-vanilla] [csi-block-vanilla-serialized] Verify CNS "+
+		"volume is deleted after full sync when pv entry is delete", ginkgo.Label(p0, block, vanilla, wcp, core,
+		vc70), func() {
 		ginkgo.By("Invoking test to verify CNS volume creation")
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -402,7 +403,7 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 	// 9. verify that pvc labels for pvclaim[2] has been updated.
 	// 10. verify that pv labels for pvs[3] has been updated.
 	// 11. cleanup to remove pvs and pvcliams.
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-serialized] Verify Multiple PVCs are "+
+	ginkgo.It("[ef-vanilla-block][csi-block-vanilla] [csi-block-vanilla-serialized] Verify Multiple PVCs are "+
 		"deleted/updated after full sync", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
 		sc, err := createStorageClass(client, nil, nil, v1.PersistentVolumeReclaimRetain, "", false, "")
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -513,8 +514,8 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 		}
 	})
 
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-serialized] Verify PVC metadata is created in CNS "+
-		"after PVC is created in k8s", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
+	ginkgo.It("[ef-vanilla-block][csi-block-vanilla] [csi-block-vanilla-serialized] Verify PVC metadata is created "+
+		"in CNS after PVC is created in k8s", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
 		var err error
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -589,8 +590,8 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})
 
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-serialized] Verify PVC metadata is deleted in CNS after "+
-		"PVC is deleted in k8s", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
+	ginkgo.It("[ef-vanilla-block][csi-block-vanilla] [csi-block-vanilla-serialized] Verify PVC metadata is deleted in"+
+		" CNS after PVC is deleted in k8s", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
 		var err error
 
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/labelupdates.go

@@ -120,7 +120,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelize
 		}
 	})
 
-	ginkgo.It("[cf-wcp] [csi-supervisor] verify labels are created in CNS after updating pvc "+
+	ginkgo.It("[ef-vanilla-block][cf-wcp] [csi-supervisor] verify labels are created in CNS after updating pvc "+
 		"and/or pv with new labels", ginkgo.Label(p1, block, vanilla, windows, wcp,
 		core), func() {
 		ginkgo.By("Invoking test to verify labels creation")
@@ -194,8 +194,8 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelize
 
 	})
 
-	ginkgo.It("[csi-supervisor] verify labels are removed in CNS after removing them from pvc and/or "+
-		"pv", ginkgo.Label(p0, block, vanilla, windows, wcp, core), func() {
+	ginkgo.It("[ef-vanilla-block][csi-supervisor] verify labels are removed in CNS after removing them from pvc "+
+		"and/or pv", ginkgo.Label(p0, block, vanilla, windows, wcp, core), func() {
 		ginkgo.By("Invoking test to verify labels deletion")
 		labels := make(map[string]string)
 		labels[labelKey] = labelValue
@@ -394,7 +394,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelize
 		8. Delete SC
 	*/
 
-	ginkgo.It("Verify PVC name is removed from PV entry on CNS after PVC is deleted "+
+	ginkgo.It("[ef-vanilla-block]Verify PVC name is removed from PV entry on CNS after PVC is deleted "+
 		"when Reclaim Policy is set to retain.", ginkgo.Label(p0, block, vanilla, windows, core), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())