Add cf labels to block vanilla tests (#3572)

Author: Aishwarya-Hebbar

tests/e2e/csi_snapshot_basic.go

@@ -244,8 +244,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		13. Cleanup: Delete PVC, SC (validate they are removed)
 	*/
 
-	ginkgo.It("[cf-wcp] [block-vanilla-snapshot] [tkg-snapshot] [supervisor-snapshot] Verify snapshot dynamic "+
-		"provisioning workflow", ginkgo.Label(p0, block, tkg, vanilla, wcp, snapshot, stable, vc90), func() {
+	ginkgo.It("[cf-wcp] [cf-vanilla-block][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot]"+
+		" Verify snapshot dynamic provisioning workflow", ginkgo.Label(p0, block, tkg,
+		vanilla, wcp, snapshot, stable, vc90), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -358,7 +359,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 			volume snapshot as the policy is delete
 		10. Cleanup the pvc
 	*/
-	ginkgo.It("[block-vanilla-snapshot] Verify snapshot static provisioning through K8s "+
+	ginkgo.It("[block-vanilla-snapshot][cf-vanilla-block] Verify snapshot static provisioning through K8s "+
 		"API workflow", ginkgo.Label(p0, block, vanilla, snapshot, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -660,7 +661,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		12. Delete volume snapshot content 2
 		13. Cleanup the pvc, volume snapshot class and storage class
 	*/
-	ginkgo.It("[block-vanilla-snapshot] Verify snapshot static provisioning with "+
+	ginkgo.It("[block-vanilla-snapshot][cf-vanilla-block] Verify snapshot static provisioning with "+
 		"deletion policy Retain", ginkgo.Label(p0, block, vanilla, snapshot, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -988,7 +989,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		10. Run cleanup: Delete snapshots, restored-volumes, pods
 	*/
 
-	ginkgo.It("[block-vanilla-snapshot] Volume restore using snapshot a dynamic snapshot b "+
+	ginkgo.It("[block-vanilla-snapshot][cf-vanilla-block] Volume restore using snapshot a dynamic snapshot b "+
 		"pre-provisioned snapshot", ginkgo.Label(p0, block, vanilla, snapshot, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -1329,8 +1330,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 	   16. Query the snapshot from CNS side - it shouldn't be available
 	   17. Delete SC and VolumeSnapshotClass
 	*/
-	ginkgo.It("[cf-vks] [block-vanilla-snapshot] [tkg-snapshot] Volume snapshot creation and restoration workflow "+
-		"with xfs filesystem", ginkgo.Label(p0, block, vanilla, tkg, snapshot, stable, vc80), func() {
+	ginkgo.It("[cf-vks][cf-vanilla-block][block-vanilla-snapshot][tkg-snapshot] Volume snapshot "+
+		"creation and restoration workflow with xfs filesystem", ginkgo.Label(p0, block,
+		vanilla, tkg, snapshot, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -1526,9 +1528,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		while the source pvc was created usig thin provisioned psp-operatorlicy
 		6. cleanup spbm policies, sc's, pvc's
 	*/
-	ginkgo.It("[cf-wcp] [block-vanilla-snapshot] [tkg-snapshot] [supervisor-snapshot] Volume "+
-		"restore using snapshot on a different "+
-		"storageclass", ginkgo.Label(p0, block, vanilla, wcp, snapshot, tkg, stable, vc90), func() {
+	ginkgo.It("[cf-wcp] [cf-vanilla-block][block-vanilla-snapshot][tkg-snapshot] [supervisor-snapshot]"+
+		" Volume restore using snapshot on a different storageclass", ginkgo.Label(p0, block, vanilla,
+		wcp, snapshot, tkg, stable, vc90), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -1665,9 +1667,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		8. Ensure the pvc with source as snapshot creates successfully and is bound
 		9. Cleanup the snapshot, pvcs and ns
 	*/
-	ginkgo.It("[block-vanilla-snapshot][tkg-snapshot] Delete the namespace hosting the pvcs and "+
-		"volume-snapshots and recover the data "+
-		"using snapshot-content", ginkgo.Label(p0, block, vanilla, snapshot, tkg, stable, vc80), func() {
+	ginkgo.It("[block-vanilla-snapshot][cf-vanilla-block][tkg-snapshot] Delete the namespace hosting the pvcs and "+
+		"volume-snapshots and recover the data using snapshot-content", ginkgo.Label(p0, block,
+		vanilla, snapshot, tkg, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -2038,8 +2040,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		3. Validate the fields after snapshot creation succeeds (snapshotClass, retentionPolicy)
 	*/
 
-	ginkgo.It("[cf-wcp] [block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot] Create snapshots using default "+
-		"VolumeSnapshotClass", ginkgo.Label(p0, block, vanilla, snapshot, wcp, tkg, vc90), func() {
+	ginkgo.It("[cf-wcp][cf-vanilla-block][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot]"+
+		" Create snapshots using default VolumeSnapshotClass", ginkgo.Label(p0, block,
+		vanilla, snapshot, wcp, tkg, vc90), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -3028,8 +3031,9 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
 		7. Cleanup dep-1 pv snapshots and pvs, delete dep-2
 	*/
 
-	ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot] Snapshot workflow for "+
-		"deployments", ginkgo.Label(p0, block, vanilla, tkg, snapshot, wcp, stable, vc80), func() {
+	ginkgo.It("[ef-wcp-snapshot][cf-vanilla-block][block-vanilla-snapshot] [tkg-snapshot]"+
+		"[supervisor-snapshot] Snapshot workflow for deployments", ginkgo.Label(p0, block,
+		vanilla, tkg, snapshot, wcp, stable, vc80), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -3174,9 +3178,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 offline "+
-		"resize of a volume having snapshots", ginkgo.Label(p0, block, vanilla, tkg, snapshot, stable, wcp,
-		negative, vc90), func() {
+	ginkgo.It("[ef-wcp-snapshot][cf-vanilla-block][block-vanilla-snapshot] [tkg-snapshot]"+
+		"[supervisor-snapshot] Volume offline resize of a volume having snapshots", ginkgo.Label(p0, block,
+		vanilla, tkg, snapshot, stable, wcp, negative, vc90), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/data_persistence.go

@@ -118,9 +118,9 @@ var _ = ginkgo.Describe("Data Persistence", func() {
 		}
 	})
 
-	ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-guest] [csi-block-vanilla-parallelized][ef-vks] Should "+
-		"create and delete pod with the same volume source "+
-		"and data", ginkgo.Label(p0, block, vanilla, wcp, tkg, core, vc70), func() {
+	ginkgo.It("[csi-block-vanilla][cf-vanilla-block][ef-vks][csi-supervisor] [csi-guest] "+
+		"[csi-block-vanilla-parallelized] Should create and delete pod with the same volume"+
+		" source and data", ginkgo.Label(p0, block, vanilla, wcp, tkg, core, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		var sc *storagev1.StorageClass

tests/e2e/labelupdates.go

@@ -282,7 +282,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelize
 
 	})
 
-	ginkgo.It("[csi-supervisor] verify podname label is created/deleted when pod with cns volume is "+
+	ginkgo.It("[cf-vanilla-block][csi-supervisor] verify podname label is created/deleted when pod with cns volume is "+
 		"created/deleted.", ginkgo.Label(p0, block, vanilla, windows, wcp, core), func() {
 		ginkgo.By("Invoking test to verify pod name label updates")
 		var sc *storagev1.StorageClass
@@ -524,7 +524,8 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelize
 		13. Delete SC
 	*/
 
-	ginkgo.It("Verify label updates on statically provisioned volume.", ginkgo.Label(p0, block, vanilla, windows,
+	ginkgo.It("[cf-vanilla-block] Verify label updates on statically provisioned volume.", ginkgo.Label(p0,
+		block, vanilla, windows,
 		core), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
@@ -658,8 +659,8 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelize
 		10. Delete PVCs
 		11. Delete SC
 	*/
-	ginkgo.It("[cf-wcp] [csi-supervisor] Verify label updates on PVC and PV attached to a stateful "+
-		"set.", ginkgo.Label(p0, block, vanilla, windows, wcp, core), func() {
+	ginkgo.It("[cf-wcp][cf-vanilla-block][csi-supervisor] Verify label updates on PVC and PV"+
+		" attached to a stateful set.", ginkgo.Label(p0, block, vanilla, windows, wcp, core), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		// decide which test setup is available to run

tests/e2e/policy_driven_vol_allocation.go

@@ -119,8 +119,6 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 	ginkgo.AfterEach(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		setVpxdTaskTimeout(ctx, 0) // reset vpxd timeout to default
-		time.Sleep(3 * time.Minute)
 		if supervisorCluster {
 			dumpSvcNsEventsOnTestFailure(client, namespace)
 		}
@@ -162,7 +160,8 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 			10	Deleted the SPBM polices created in step 1
 	*/
 	ginkgo.It("[csi-block-vanilla][csi-block-vanilla-parallelized][csi-guest][csi-supervisor]"+
-		"[csi-wcp-vsan-direct][ef-vks-thickthin] Verify Thin, EZT, LZT volume creation via SPBM "+
+		"[csi-wcp-vsan-direct][ef-vks-thickthin][cf-vanilla-block] Verify Thin,"+
+		"EZT, LZT volume creation via SPBM "+
 		"policies", ginkgo.Label(p0, vanilla, block, thickThin, wcp, tkg, windows, stable, vsanDirect, vc70), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -700,7 +699,6 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		}
 
 		scParameters := make(map[string]string)
-
 		rand.New(rand.NewSource(time.Now().UnixNano()))
 		suffix := fmt.Sprintf("-%v-%v", time.Now().UnixNano(), rand.Intn(10000))
 		randomStr := strconv.Itoa(rand.Intn(10000))
@@ -2387,6 +2385,10 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
+		setVpxdTaskTimeout(ctx, vpxdReducedTaskTimeoutSecsInt)
+		defer func() {
+			setVpxdTaskTimeout(ctx, 0)
+		}()
 		sharedvmfsURL := os.Getenv(envSharedVMFSDatastoreURL)
 		if sharedvmfsURL == "" {
 			ginkgo.Skip(fmt.Sprintf("Env %v is missing", envSharedVMFSDatastoreURL))

tests/e2e/raw_block_volume.go

@@ -1121,7 +1121,7 @@ var _ = ginkgo.Describe("raw block volume support", func() {
 		15. Query the snapshot from CNS side - should return 0 entries
 		16. Cleanup: Delete PVC, SC (validate they are removed)
 	*/
-	ginkgo.It("[cf-vks] [block-vanilla-snapshot] [tkg-snapshot] Verify snapshot dynamic provisioning "+
+	ginkgo.It("[cf-vks] [block-vanilla-snapshot] [cf-vanilla-block][tkg-snapshot] Verify snapshot dynamic provisioning "+
 		"workflow with raw block "+
 		"volume", ginkgo.Label(p0, block, vanilla, tkg, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/svmotion_volumes.go

@@ -207,8 +207,8 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Re
 	   CnsRelocateVolume API and verify the datastore of fcd after migration and volume compliance.
 	6. Delete pod,pvc and sc.
 	*/
-	ginkgo.It("Online relocation of volume using cnsRelocate Volume API", ginkgo.Label(p0, vanilla, block, core,
-		vc70), func() {
+	ginkgo.It("[cf-vanilla-block] Online relocation of volume using cnsRelocate Volume API", ginkgo.Label(p0,
+		vanilla, block, core, vc70), func() {
 		ginkgo.By("Invoking Test for offline relocation")
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -369,8 +369,8 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Re
 	   using CnsRelocateVolume API and verify the datastore of fcd after migration and volume compliance.
 	5. Delete pvc and sc.
 	*/
-	ginkgo.It("Offline relocation of volume using cnsRelocate Volume API", ginkgo.Label(p0, vanilla, block, core,
-		vc70), func() {
+	ginkgo.It("[cf-vanilla-block] Offline relocation of volume using cnsRelocate Volume API", ginkgo.Label(p0,
+		vanilla, block, core, vc70), func() {
 		ginkgo.By("Invoking Test for offline relocation")
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/vsphere_shared_datastore.go

@@ -112,7 +112,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] "+
 
 	// Setting non-shared datastore in the storage class should fail dynamic
 	// volume provisioning.
-	ginkgo.It("Verify dynamic provisioning of PV fails with user specified non-shared datastore and "+
+	ginkgo.It("[cf-vanilla-block] Verify dynamic provisioning of PV fails with user specified non-shared datastore and "+
 		"no storage policy specified in the storage class", ginkgo.Label(p0, block, vanilla, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/vsphere_volume_disksize.go

@@ -87,8 +87,8 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-supervisor]
 	})
 
 	// Test for valid disk size of 2Gi
-	ginkgo.It("[cf-vanilla-file] Verify dynamic provisioning of pv using storageclass with a valid disk "+
-		"size passes", ginkgo.Label(p0, block, file, wcp, tkg, vanilla, vc70), func() {
+	ginkgo.It("[cf-vanilla-file] [cf-vanilla-block] Verify dynamic provisioning of pv using "+
+		"storageclass with a valid disk size passes", ginkgo.Label(p0, block, file, wcp, tkg, vanilla, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		ginkgo.By("Invoking Test for valid disk size")

tests/e2e/vsphere_volume_expansion.go

@@ -157,7 +157,7 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 	// 10. Delete PVC, PV and Storage Class.
 
 	ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-guest] [csi-block-vanilla-parallelized] [csi-vcp-mig]"+
-		"[ef-vks] Verify volume expansion with no filesystem before expansion", ginkgo.Label(p0,
+		"[ef-vks][cf-vanilla-block] Verify volume expansion with no filesystem before expansion", ginkgo.Label(p0,
 		block, vanilla, wcp, tkg, core, vc70), func() {
 		invokeTestForVolumeExpansion(f, client, namespace, "", storagePolicyName, profileID)
 	})
@@ -182,7 +182,7 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 	// 13. Delete PVC, PV and Storage Class.
 
 	ginkgo.It("[csi-block-vanilla] [csi-guest] [csi-block-vanilla-parallelized] [csi-vcp-mig] "+
-		"[ef-vks] Verify volume expansion with initial filesystem before "+
+		"[ef-vks][cf-vanilla-block] Verify volume expansion with initial filesystem before "+
 		"expansion", ginkgo.Label(p0, block, vanilla, tkg, core, vc70), func() {
 		invokeTestForVolumeExpansionWithFilesystem(f, client, namespace, fsType, "", storagePolicyName, profileID)
 	})
@@ -256,8 +256,9 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 	// 7. Delete PVC.
 	// 8. Verify PV is deleted automatically.
 
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-parallelized] Verify volume expansion is not supported for PVC "+
-		"using vSAN-Default-Storage-Policy", ginkgo.Label(p0, block, vanilla, core, vc70), func() {
+	ginkgo.It("[csi-block-vanilla][cf-vanilla-block][csi-block-vanilla-parallelized]Verify volume "+
+		"expansion is not supported for PVC using vSAN-Default-Storage-Policy", ginkgo.Label(p0,
+		block, vanilla, core, vc70), func() {
 		invokeTestForInvalidVolumeExpansionStaticProvision(f, client, namespace, storagePolicyName, profileID)
 	})
 
@@ -571,9 +572,9 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 			8. Verify the PVC Size should increased by 10Gi
 			9. Make sure file system has increased
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-guest] [csi-block-vanilla-parallelized]"+
-		"[csi-vcp-mig] [ef-vks] Verify volume expansion multiple times on the "+
-		"same PVC", ginkgo.Label(p0, block, vanilla, wcp, tkg, core, vc70), func() {
+	ginkgo.It("[csi-block-vanilla][cf-vanilla-block][ef-vks][csi-supervisor] [csi-guest]"+
+		"[csi-block-vanilla-parallelized] [csi-vcp-mig] Verify volume expansion multiple times"+
+		" on the same PVC", ginkgo.Label(p0, block, vanilla, wcp, tkg, core, vc70), func() {
 
 		ginkgo.By("Invoking Test for Volume Expansion")
 		ctx, cancel := context.WithCancel(context.Background())
@@ -1103,9 +1104,9 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 		9. Make sure data is intact on the PV mounted on the pod
 		10.  Make sure file system has increased
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-guest] [csi-block-vanilla-parallelized]"+
-		"[csi-vcp-mig] [ef-vks] Volume expansion on shared NFS datastore", ginkgo.Label(p0,
-		block, vanilla, wcp, tkg, core, vc70), func() {
+	ginkgo.It("[csi-block-vanilla][cf-vanilla-block][csi-supervisor][csi-guest][csi-block-vanilla-parallelized]"+
+		"[csi-vcp-mig][ef-vks] Volume expansion on shared NFS datastore", ginkgo.Label(p0, block, vanilla, wcp,
+		tkg, core, vc70), func() {
 		ginkgo.By("Invoking Test for Volume Expansion")
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -1200,8 +1201,8 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 		9. Make sure data is intact on the PV mounted on the pod
 		10.  Make sure file system has increased
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-guest] [csi-block-vanilla-parallelized]"+
-		"[csi-vcp-mig] [ef-vks] Volume expansion on shared VMFS datastore", ginkgo.Label(p0,
+	ginkgo.It("[csi-block-vanilla][cf-vanilla-block][ef-vks][csi-supervisor] [csi-guest] "+
+		"[csi-block-vanilla-parallelized][csi-vcp-mig] Volume expansion on shared VMFS datastore", ginkgo.Label(p0,
 		block, vanilla, wcp, tkg, core, vc70), func() {
 		ginkgo.By("Invoking Test for Volume Expansion")
 		ctx, cancel := context.WithCancel(context.Background())
@@ -2435,9 +2436,9 @@ var _ = ginkgo.Describe("Volume Expansion Test", func() {
 		11. Scale down deployment set to 0 replicas and delete all pods, PVC and SC
 
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-supervisor] [csi-guest] [csi-block-vanilla-parallelized] [csi-vcp-mig]"+
-		"[ef-vks] Verify online volume expansion on deployment", ginkgo.Label(p0, vanilla, block, wcp,
-		tkg, vc70), func() {
+	ginkgo.It("[csi-block-vanilla][cf-vanilla-block][ef-vks][csi-supervisor] [csi-guest] "+
+		"[csi-block-vanilla-parallelized] [csi-vcp-mig] Verify online volume expansion"+
+		" on deployment", ginkgo.Label(p0, vanilla, block, wcp, tkg, vc70), func() {
 		ginkgo.By("Invoking Test for Volume Expansion")
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/vsphere_volume_fsgroup.go

@@ -89,7 +89,7 @@ var _ = ginkgo.Describe("[ef-vks] [csi-block-vanilla] [csi-file-vanilla] [csi-gu
 	})
 
 	// Test for Pod creation works when SecurityContext has FSGroup
-	ginkgo.It("[cf-vanilla-file]Verify Pod Creation works when SecurityContext has "+
+	ginkgo.It("[cf-vanilla-file][cf-vanilla-block] Verify Pod Creation works when SecurityContext has "+
 		"FSGroup", ginkgo.Label(p0, vanilla, block, file, wcp, tkg, core, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()