Adding the additional labels to vanilla block and file tests (#3750)

* Adding common lables to all the tests

* Resolved the lint errors

* Update config_change_test.go

Author: hemanth-kumar-nooka

tests/e2e/config_change_test.go

@@ -68,8 +68,8 @@ var _ bool = ginkgo.Describe("[csi-supervisor] config-change-test", func() {
 			7. Revert the password change
 			8. Delete Storage class
 	*/
-	ginkgo.It("[pq-wcp][pq-vanilla-block] verify PVC deletion after VC password change", ginkgo.Label(p1,
-		block, wcp, vc80), func() {
+	ginkgo.It("[pq-wcp][pq-vanilla-block][pq-n1-vanilla-block][pq-n2-vanilla-block]  verify PVC deletion after VC "+
+		"password change", ginkgo.Label(p1, block, wcp, vc80), func() {
 		ginkgo.By("Invoking password change test")
 		profileID := e2eVSphere.GetSpbmPolicyID(storagePolicyName)
 		scParameters[scParamStoragePolicyID] = profileID

tests/e2e/config_secret.go

@@ -150,8 +150,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		7. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Update user credentials in vsphere config secret "+
-		"keeping password same for both test users", ginkgo.Label(p1, vsphereConfigSecret, block, file, vanilla), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Update user credentials in vsphere config secret keeping password same for both test"+
+		" users", ginkgo.Label(p1, vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -249,8 +250,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		12. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block]Change vcenter user password and restart "+
-		"csi controller pod", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Change vcenter user password and restart csi controller pod", ginkgo.Label(p0,
+		vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		testUser1NewPassword := "Admin!123"
@@ -406,8 +408,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		7. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Update user credentials in vsphere config secret keeping "+
-		"password different for both test users", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Update user credentials in vsphere config secret keeping password different for both"+
+		" test users", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -503,8 +506,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		9. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Change vcenter ip to hostname and viceversa in vsphere config "+
-		"secret", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Change vcenter ip to hostname and viceversa in vsphere config secret", ginkgo.Label(p0,
+		vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -619,8 +623,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		9. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Change vcenter user to wrong dummy user and later switch back to "+
-		"correct one", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Change vcenter user to wrong dummy user and later switch back to correct"+
+		" one", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		dummyTestUser := "[email protected]"
@@ -748,8 +753,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		10. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Add a user without adding required roles and privileges "+
-		"and switch back to the correct one", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Add a user without adding required roles and privileges and switch back to the correct"+
+		" one", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -869,8 +875,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		8. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Add necessary roles and privileges to the user post CSI driver "+
-		"creation", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Add necessary roles and privileges to the user post CSI driver"+
+		" creation", ginkgo.Label(p0, vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
@@ -981,10 +988,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		10. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Add wrong datacenter and switch back to the "+
-		"correct datacenter in vsphere config secret file", ginkgo.Label(p1, vsphereConfigSecret,
-		block, file, vanilla), func() {
-
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Add wrong datacenter and switch back to the correct datacenter in vsphere config"+
+		" secret file", ginkgo.Label(p1, vsphereConfigSecret, block, file, vanilla), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		dummyDataCenter := "Dummy-Data-Center"
@@ -1108,8 +1114,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 	    9. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] VC with Custom Port", ginkgo.Label(p1, vsphereConfigSecret,
-		file, block, customPort), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] "+
+		"VC with Custom Port", ginkgo.Label(p1, vsphereConfigSecret, file, block, customPort), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		defaultvCenterPort := "443"
@@ -1236,9 +1243,9 @@ var _ = ginkgo.Describe("Config-Secret", func() {
 		10. Cleanup all objects created during the test
 	*/
 
-	ginkgo.It("[pq-vanilla-file][pq-vanilla-block] Modify VC Port and validate the workloads", ginkgo.Label(p1,
-		vsphereConfigSecret, file, block,
-		customPort), func() {
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-vanilla-block] Modify VC Port and validate the workloads", ginkgo.Label(p1,
+		vsphereConfigSecret, file, block, customPort), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		dummyvCenterPort := "4444"

tests/e2e/csi_cns_telemetry.go

@@ -102,7 +102,8 @@ 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][pq-vanilla-block]Verify dynamic provisioning of pvc has cluster-distribution value "+
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-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 +285,8 @@ 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][pq-vanilla-block]Verify PVC goes to Pending when cluster distribution name has more"+
+	ginkgo.It("[pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block]"+
+		"[pq-n2-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,7 +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][pq-vanilla-block]Statefulset service for "+
+	ginkgo.It("[ef-vks][ef-vks-n1][ef-vks-n2][pq-vanilla-file][pq-n1-vanilla-file][pq-n2-vanilla-file]"+
+		"[pq-vanilla-block][pq-n1-vanilla-block][pq-n2-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

tests/e2e/csi_cns_telemetry_vc_reboot.go

@@ -95,7 +95,8 @@ 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][pq-vanilla-block]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-block-vanilla-serialized][pq-vanilla-file]"+
+		"[pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block][pq-n2-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 +284,8 @@ 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][pq-vanilla-block]"+
+	ginkgo.It("[csi-block-vanilla][csi-file-vanilla][csi-block-vanilla-serialized][pq-vanilla-file]"+
+		"[pq-n1-vanilla-file][pq-n2-vanilla-file][pq-vanilla-block][pq-n1-vanilla-block][pq-n2-vanilla-block] "+
 		"verify volume operations after vc reboots", ginkgo.Label(p1, block, file, vanilla, disruptive,
 		negative, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())