pq tag on block vanilla tests (#3619)

Author: rajguptavm

tests/e2e/csi_cns_telemetry.go

@@ -102,7 +102,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-block-vanil
 	// 7. Expect the old PVC to reflect the latest cluster-distribution value.
 
 	// Test for cluster-distribution value presence.
-	ginkgo.It("[pq-vanilla-file]Verify dynamic provisioning of pvc has cluster-distribution value "+
+	ginkgo.It("[pq-vanilla-file][pq-vanilla-block]Verify dynamic provisioning of pvc has cluster-distribution value "+
 		"updated", ginkgo.Label(p0, block, file, vanilla, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -284,7 +284,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-block-vanil
 	// 2. Create a PVC.
 	// 3. Expect PVC to go to Pending state.
 
-	ginkgo.It("[pq-vanilla-file]Verify PVC goes to Pending when cluster distribution name has more"+
+	ginkgo.It("[pq-vanilla-file][pq-vanilla-block]Verify PVC goes to Pending when cluster distribution name has more"+
 		" than 128 characters", ginkgo.Label(p0, block, file, vanilla, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/csi_cns_telemetry_statefulsets.go

@@ -96,8 +96,8 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-supervisor]
 		}
 	})
 
-	ginkgo.It("[ef-vks][ef-vks-n1][ef-vks-n2] [pq-vanilla-file]Statefulset service for cluster-distribution metadata "+
-		"check", ginkgo.Label(p0, block, file, vanilla, wcp, tkg, vc70), func() {
+	ginkgo.It("[ef-vks][ef-vks-n1][ef-vks-n2][pq-vanilla-file][pq-vanilla-block]Statefulset service for "+
+		"cluster-distribution metadata check", ginkgo.Label(p0, block, file, vanilla, wcp, tkg, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		var clusterDistributionValue string
 		var sc *v1.StorageClass

tests/e2e/csi_cns_telemetry_vc_reboot.go

@@ -95,7 +95,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] "+
 	// 13. Delete pod and Wait for Volume Disk to be detached from the Node.
 	// 14. Delete PVC, PV and Storage Class.
 
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla] [csi-block-vanilla-serialized][pq-vanilla-file] "+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-block-vanilla-serialized][pq-vanilla-file][pq-vanilla-block]"+
 		"verify volume operations while vc reboot", ginkgo.Label(p1, block, file, vanilla, disruptive,
 		negative, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
@@ -283,7 +283,7 @@ var _ bool = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] "+
 	// 12. Wait for Disk to be attached to the node.
 	// 13. Delete pod and Wait for Volume Disk to be detached from the Node.
 	// 14. Delete PVC, PV and Storage Class.
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla] [csi-block-vanilla-serialized][pq-vanilla-file] "+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-block-vanilla-serialized][pq-vanilla-file][pq-vanilla-block]"+
 		"verify volume operations after vc reboots", ginkgo.Label(p1, block, file, vanilla, disruptive,
 		negative, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/csi_static_provisioning_basic.go

@@ -495,8 +495,8 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 	// 7. Wait for the volume entry to be created in CNS.
 	// 8. Delete PV2.
 	// 9. Wait for PV2 to be deleted, and also entry is deleted from CNS.
-	ginkgo.It("[csi-block-vanilla] [csi-block-vanilla-parallelized] Verify static provisioning workflow using "+
-		"same PV name twice", ginkgo.Label(p2, block, vanilla, core, vc70), func() {
+	ginkgo.It("[csi-block-vanilla][csi-block-vanilla-parallelized][pq-vanilla-block]Verify static provisioning "+
+		"workflow using same PV name twice", ginkgo.Label(p2, block, vanilla, core, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -2148,7 +2148,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 		7.Verify Volume is deleted.
 		8.Delete FCD.
 	*/
-	ginkgo.It("[ef-wcp][csi-block-vanilla] [csi-supervisor] Full sync to deregister/delete "+
+	ginkgo.It("[ef-wcp][csi-block-vanilla][csi-supervisor][pq-vanilla-block] Full sync to deregister/delete "+
 		"volume", ginkgo.Label(p0, block, wcp, vanilla, core, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
@@ -2302,7 +2302,7 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 		5.Wait for volume to be deleted from K8s.
 		6.Wait for Volume to be deleted on CNS
 	*/
-	ginkgo.It("[ef-wcp][csi-block-vanilla] [csi-supervisor] VMDK is deleted from datastore "+
+	ginkgo.It("[ef-wcp][csi-block-vanilla][csi-supervisor][pq-vanilla-block] VMDK is deleted from datastore "+
 		"but CNS volume is still present", ginkgo.Label(p1, block, wcp, vanilla, core, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/fullsync_test_for_block_volume.go

@@ -682,8 +682,9 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 
 	})
 
-	ginkgo.It("[csi-block-vanilla-destructive] Scale down driver deployment to zero replica and verify "+
-		"PV metadata is created in CNS", ginkgo.Label(p1, negative, block, vanilla, disruptive, core, vc70), func() {
+	ginkgo.It("[csi-block-vanilla-destructive][pq-vanilla-block] Scale down driver deployment to zero replica and "+
+		"verify PV metadata is created in CNS", ginkgo.Label(p1, negative, block, vanilla, disruptive, core,
+		vc70), func() {
 		var err error
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -780,9 +781,9 @@ var _ bool = ginkgo.Describe("full-sync-test", func() {
 			8.	delete pod2
 			9.	delete pvc1
 	*/
-	ginkgo.It("[ef-wcp][csi-block-vanilla][csi-supervisor][csi-guest][csi-block-vanilla-serialized] Attach volume "+
-		"to a new pod when CNS is down and verify volume metadata in CNS post full sync", ginkgo.Label(p1, negative,
-		block, vanilla, wcp, tkg, core, vc70), func() {
+	ginkgo.It("[ef-wcp][csi-block-vanilla][csi-supervisor][csi-guest][csi-block-vanilla-serialized][pq-vanilla-block]"+
+		"Attach volume to a new pod when CNS is down and verify volume metadata in CNS post full "+
+		"sync", ginkgo.Label(p1, negative, block, vanilla, wcp, tkg, core, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		var err error

tests/e2e/improved_csi_idempotency.go

@@ -177,7 +177,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		7. Verify no orphan volumes are left (using cnsctl tool)
 	*/
 
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor] [pq-vanilla-file]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block]"+
 		"Reduce external provisioner timeout and create volumes - idempotency", ginkgo.Label(p0, disruptive, block,
 		file, windows, wcp, tkg, vanilla, vc70), func() {
 		createVolumesByReducingProvisionerTime(namespace, client, storagePolicyName, scParameters,
@@ -203,7 +203,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		5. Delete PVCs and SC
 		6. Verify no orphan volumes are left
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor][pq-vanilla-file]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block]"+
 		"create volume when hostd service goes down - idempotency", ginkgo.Label(p0, disruptive, block, file, windows,
 		wcp, tkg, vanilla, vc70), func() {
 		serviceName = hostdServiceName
@@ -221,7 +221,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		6. Delete pvcs and SC
 		7. Verify no orphan volumes are left
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor][pq-vanilla-file]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block]"+
 		"create volume when CNS goes down - idempotency", ginkgo.Label(p0, disruptive, block, file, windows, wcp, tkg,
 		vanilla, vc70), func() {
 		serviceName = vsanhealthServiceName
@@ -239,7 +239,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		6. Delete pvcs and SC
 		7. Verify no orphan volumes are left
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor][pq-vanilla-file]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block]"+
 		"create volume when VPXD goes down - idempotency", ginkgo.Label(p0, disruptive, block, file, windows, wcp, tkg,
 		vanilla, vc70), func() {
 		serviceName = vpxdServiceName
@@ -257,7 +257,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		6. Delete pvcs and SC
 		7. Verify no orphan volumes are left
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor][pq-vanilla-file]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block]"+
 		"create volume when SPS goes down - idempotency", ginkgo.Label(p0, block, file, windows, wcp, tkg,
 		vanilla, vc80), func() {
 		serviceName = spsServiceName
@@ -274,7 +274,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		5. Delete PVCs and SC
 		6. Verify no orphan volumes are left
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor][pq-vanilla-file]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block]"+
 		"create volume when CSI restarts - idempotency", ginkgo.Label(p0, disruptive, block, file, windows, wcp, tkg,
 		vanilla, vc70), func() {
 		serviceName = "CSI"
@@ -292,7 +292,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		6. Delete pvcs and SC
 		7. Verify no orphan volumes are left
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor][pq-vanilla-file] "+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block]"+
 		"extend volume when csi restarts - idempotency", ginkgo.Label(p0, disruptive, block, file, windows, wcp, tkg,
 		vanilla, vc70), func() {
 		serviceName = "CSI"
@@ -311,7 +311,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
 		7. Delete pvcs and SC
 		8. Verify no orphan volumes are left
 	*/
-	ginkgo.It("[csi-block-vanilla] [csi-file-vanilla][csi-guest] [csi-supervisor][pq-vanilla-file] "+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file][pq-vanilla-block] "+
 		"extend volume when CNS goes down - idempotency", ginkgo.Label(p0, disruptive, block, file, windows, wcp, tkg,
 		vanilla, vc70), func() {
 		serviceName = vsanhealthServiceName

tests/e2e/multi_master_k8s.go

@@ -134,8 +134,8 @@ var _ = ginkgo.Describe("[csi-multi-master-block-e2e]", func() {
 		7. Delete all PVCs from the tests namespace.
 		8. Delete the storage class.
 	*/
-	ginkgo.It("Power off the node where vsphere-csi-controller pod is running", ginkgo.Label(p0, block, vanilla,
-		vc70), func() {
+	ginkgo.It("[pq-vanilla-block]Power off the node where vsphere-csi-controller pod is running", ginkgo.Label(p0,
+		block, vanilla, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		nodeList, podList := getControllerRuntimeDetails(client, controllerNamespace)
@@ -236,8 +236,8 @@ var _ = ginkgo.Describe("[csi-multi-master-block-e2e]", func() {
 		9. Delete the storage class.
 	*/
 
-	ginkgo.It("[csi-block-vanilla] [csi-supervisor] Stop kubelet on the node where vsphere-csi-controller "+
-		"pod is running", ginkgo.Label(p0, block, vanilla, vc70), func() {
+	ginkgo.It("[csi-block-vanilla][csi-supervisor][pq-vanilla-block] Stop kubelet on the node where "+
+		"vsphere-csi-controller pod is running", ginkgo.Label(p0, block, vanilla, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		nodeList, podList := getControllerRuntimeDetails(client, controllerNamespace)

tests/e2e/nodes_scaleup_scaledown.go

@@ -81,7 +81,7 @@ var _ = ginkgo.Describe("[csi-file-vanilla] [csi-block-vanilla-serialized] Nodes
 		11. Delete all PVCs from the tests namespace.
 		12. Delete the storage class.
 	*/
-	ginkgo.It("[pq-vanilla-file]Statefulset with Nodes Scale-up and Scale-down", ginkgo.Label(p1,
+	ginkgo.It("[pq-vanilla-file][pq-vanilla-block]Statefulset with Nodes Scale-up and Scale-down", ginkgo.Label(p1,
 		vanilla, block, file, vc70), func() {
 		curtime := time.Now().Unix()
 		randomValue := rand.Int()

tests/e2e/operationstorm.go

@@ -122,7 +122,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Vo
 		}
 	})
 
-	ginkgo.It("create/delete pod with many volumes and verify no attach/detach call should "+
+	ginkgo.It("[pq-vanilla-block]create/delete pod with many volumes and verify no attach/detach call should "+
 		"fail", ginkgo.Label(p0, vanilla, block, windows, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -243,7 +243,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Vo
 		7. Delete Namespace  and Wait for volumes to be deleted and Volume Disk to be detached from the Node.
 	*/
 
-	ginkgo.It("[csi-file-vanilla] [csi-guest][pq-vanilla-file] Delete namespace to "+
+	ginkgo.It("[csi-file-vanilla][csi-guest][pq-vanilla-file][pq-vanilla-block] Delete namespace to "+
 		"confirm all volumes and pods are deleted", ginkgo.Label(p0, vanilla, block, file, tkg, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/policy_driven_vol_allocation.go

@@ -416,9 +416,9 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		9. Delete the SCs created in step 2
 		10. Deleted the SPBM policies created in step 1
 	*/
-	ginkgo.It("[ef-svc-volallowcation][csi-block-vanilla][csi-guest][csi-supervisor][csi-wcp-vsan-direct] Fill "+
-		"LZT/EZT volume", ginkgo.Label(p0, vanilla, block, thickThin, wcp, tkg, windows, stable, vsanDirect,
-		vc70), func() {
+	ginkgo.It("[ef-svc-volallowcation][csi-block-vanilla][csi-guest][csi-supervisor][csi-wcp-vsan-direct]"+
+		"[pq-vanilla-block] Fill LZT/EZT volume", ginkgo.Label(p0, vanilla, block, thickThin, wcp, tkg, windows,
+		stable, vsanDirect, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		sharedvmfsURL, vsanDDatstoreURL := "", ""
@@ -671,9 +671,9 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		7. Delete the SC created in step 2
 		8. Deleted the SPBM policy created in step 1
 	*/
-	ginkgo.It("[pq-svc-volallowcation-neg][csi-block-vanilla][csi-guest][csi-supervisor][csi-wcp-vsan-direct] Verify "+
-		"large EZT volume creation which takes longer than vpxd timeout", ginkgo.Label(p0, vanilla, block, thickThin,
-		wcp, tkg, windows, stable, vsanDirect, vc70), func() {
+	ginkgo.It("[pq-svc-volallowcation-neg][csi-block-vanilla][csi-guest][csi-supervisor][csi-wcp-vsan-direct]"+
+		"[pq-vanilla-block] Verify large EZT volume creation which takes longer than vpxd timeout", ginkgo.Label(p0,
+		vanilla, block, thickThin, wcp, tkg, windows, stable, vsanDirect, vc70), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -879,9 +879,9 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		10	Delete the SC created in step 2
 		11	Deleted the SPBM policy created in step 1
 	*/
-	ginkgo.It("[pq-svc-volallowcation-neg][csi-block-vanilla][csi-guest][csi-supervisor][csi-wcp-vsan-direct] Verify "+
-		"EZT online volume expansion to a large size which takes longer than vpxd timeout", ginkgo.Label(p0, vanilla,
-		block, thickThin, wcp, windows, tkg, stable, vsanDirect, vc70), func() {
+	ginkgo.It("[pq-svc-volallowcation-neg][csi-block-vanilla][csi-guest][csi-supervisor][csi-wcp-vsan-direct]"+
+		"[pq-vanilla-block] Verify EZT online volume expansion to a large size which takes longer than vpxd "+
+		"timeout", ginkgo.Label(p0, vanilla, block, thickThin, wcp, windows, tkg, stable, vsanDirect, vc70), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -2377,9 +2377,9 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		11	Delete the SCs created in step 2
 		12	Deleted the SPBM policies created in step 1
 	*/
-	ginkgo.It("[pq-svc-volallowcation-neg][csi-block-vanilla][csi-guest][csi-supervisor] Verify expansion during "+
-		"Thin -> EZT, LZT -> EZT conversion (should take >vpxd task timeout)", ginkgo.Label(p0, vanilla, block,
-		thickThin, wcp, tkg, windows, stable, vc70), func() {
+	ginkgo.It("[pq-svc-volallowcation-neg][csi-block-vanilla][csi-guest][csi-supervisor][pq-vanilla-block] Verify "+
+		"expansion during Thin -> EZT, LZT -> EZT conversion (should take >vpxd task timeout)", ginkgo.Label(p0,
+		vanilla, block, thickThin, wcp, tkg, windows, stable, vc70), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -3317,7 +3317,7 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 			11. Verify online volume conversion is successful.
 			12. Delete all the objects created during the test.
 	*/
-	ginkgo.It("[csi-block-vanilla][csi-block-vanilla-parallelized]"+
+	ginkgo.It("[csi-block-vanilla][csi-block-vanilla-parallelized][pq-vanilla-block]"+
 		" Start attached volume's conversion while creation of snapshot and"+
 		" relocation of volume in parallel", ginkgo.Label(p0, vanilla, block, thickThin, stable, vc70), func() {