EF UTS Production test cases fixes (#3648)

Author: sipriyaa

tests/e2e/csi_static_provisioning_basic.go

@@ -1766,8 +1766,8 @@ var _ = ginkgo.Describe("Basic Static Provisioning", func() {
 	// 7. Wait for PV , PVC to get bound.
 	// 8. Create POD, verify the status.
 	// 9. Delete all the above created PV, PVC and resource quota.
-	ginkgo.It("[ef-vks] [ef-vks-n1][ef-vks-n2][csi-guest] static volume provisioning on guest "+
-		"cluster", ginkgo.Label(p0, block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f] [ef-vks-n1-f][ef-vks-n2-f][csi-guest] static volume provisioning "+
+		"on guest cluster", ginkgo.Label(p0, block, tkg, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/gc_block_resize_retain_policy.go

@@ -414,8 +414,8 @@ var _ = ginkgo.Describe("[csi-guest][ef-vks] [ef-vks-n1][ef-vks-n2] Volume Expan
 	// 16. delete SC created in step 1 and step 7.
 	// 17. delete GC2.
 	// Steps 6 and 17 need to run manually before and after this suite.
-	ginkgo.It("[ef-vks-f] PV with reclaim policy retain can be resized when used in a fresh GC", ginkgo.Label(p0,
-		block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f] [ef-vks-n1-f][ef-vks-n2-f] PV with reclaim policy retain can be resized "+
+		"when used in a fresh GC", ginkgo.Label(p0, block, tkg, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		newGcKubconfigPath := os.Getenv("NEW_GUEST_CLUSTER_KUBE_CONFIG")
@@ -837,8 +837,9 @@ var _ = ginkgo.Describe("[csi-guest][ef-vks] [ef-vks-n1][ef-vks-n2] Volume Expan
 	//    16. delete SC created in step 1 and step 7.
 	//    17. delete GC1.
 
-	ginkgo.It("[ef-vks-f] online volume expansion-PV with reclaim policy retain can be "+
-		"resized when used in a fresh GC", ginkgo.Label(p0, block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f][ef-vks-n1-f][ef-vks-n2-f] online volume expansion-PV with reclaim "+
+		"policy retain can be resized when used in a fresh GC", ginkgo.Label(p0,
+		block, tkg, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -998,9 +999,9 @@ var _ = ginkgo.Describe("[csi-guest][ef-vks] [ef-vks-n1][ef-vks-n2] Volume Expan
 	// 11. verify File system size
 	// 12. Delete POD, PVC, PV and SC
 
-	ginkgo.It("Offline resize of PVC in GC1, Delete PVC and PV in GC1. Statically "+
-		"prov same PVC and PV in GC1 and deploy a Pod and trigger online volume expansion", ginkgo.Label(p0,
-		block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f][ef-vks-n1-f][ef-vks-n2-f] Offline resize of PVC in GC1, Delete PVC "+
+		"and PV in GC1. Statically prov same PVC and PV in GC1 and deploy a Pod and "+
+		"trigger online volume expansion", ginkgo.Label(p0, block, tkg, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/gc_block_volume_expansion.go

@@ -1527,8 +1527,8 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
 	// 11. delete the pod created in step 10.
 	// 12. delete PVC created in step 2.
 	// 13. delete SC created in step 1.
-	ginkgo.It("[ef-vks][ef-vks-n1][ef-vks-n2] Verify Online volume expansion on dynamic PVC and "+
-		"check FS resize", ginkgo.Label(p1, block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f][ef-vks-n1-f][ef-vks-n2-f] Verify Online volume expansion on "+
+		"dynamic PVC and check FS resize", ginkgo.Label(p1, block, tkg, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		// Create a Pod to use this PVC, and verify volume has been attached.
@@ -1901,8 +1901,9 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
 	// 9. Trigger online volume expansion on gc-pvc and make sure volume
 	//    expansion is successful.
 	// 10. Delete all the above created PV, PVC and resource quota.
-	ginkgo.It("[ef-vks-f][ef-vks-n1-f][ef-vks-n2-f] Online volume resize on statically created PVC "+
-		"on guest cluster svcPVC=gcPVC", ginkgo.Label(p1, block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f][ef-vks-n1-f][ef-vks-n2-f] Online volume resize on statically "+
+		"created PVC on guest cluster svcPVC=gcPVC", ginkgo.Label(p1, block,
+		tkg, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -1996,8 +1997,9 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
 	// 9. Trigger online volume expansion on gc-pvc, Since  svc-PVC size is
 	//    already greater than the gcPVC , Online expansion on gcPVC should fail.
 	// 10. Delete all the above created PV, PVC and resource quota.
-	ginkgo.It("[ef-vks][ef-vks-n1][ef-vks-n2] Online volume resize on statically created PVC on guest "+
-		"cluster when gcPVC<svcPVC", ginkgo.Label(p1, block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f][ef-vks-n1-f][ef-vks-n2-f] Online volume resize on statically "+
+		"created PVC on guest cluster when gcPVC<svcPVC", ginkgo.Label(p1,
+		block, tkg, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
@@ -2101,8 +2103,8 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
 	// 9. Trigger online volume expansion on gc-pvc, Online expansion on gcPVC
 	//    should be successful.
 	// 10. Delete all the above created PV, PVC and resource quota.
-	ginkgo.It("[ef-vks][ef-vks-n1][ef-vks-n2] Online volume resize on statically created PVC on guest "+
-		"cluster when svcPVC<gcPVC", ginkgo.Label(p1, block, tkg, vc70), func() {
+	ginkgo.It("[ef-vks-f][ef-vks-n1-f][ef-vks-n2-f] Online volume resize on statically created "+
+		"PVC on guest cluster when svcPVC<gcPVC", ginkgo.Label(p1, block, tkg, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

tests/e2e/util.go

@@ -4027,7 +4027,9 @@ func waitForCNSRegisterVolumeToGetCreated(ctx context.Context, restConfig *rest.
 		}
 	}
 
-	describeCNSRegisterVolume(ctx, svcNamespace, cnsRegisterVolumeName)
+	if supervisorCluster {
+		describeCNSRegisterVolume(ctx, svcNamespace, cnsRegisterVolumeName)
+	}
 
 	return fmt.Errorf("cnsRegisterVolume %s creation is failed within %v", cnsRegisterVolumeName, timeout)
 }