Skip to content

Commit 5ee8107

Browse files
sipriyaasipriyaa
authored
Removing testcases from PQ Experimental (#3706)
1 parent 74a9463 commit 5ee8107

7 files changed

+113
-62
lines changed

‎tests/e2e/csi_snapshot_basic.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2145,7 +2145,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
21452145
*/
21462146

21472147
ginkgo.It("[ef-vanilla-block][cf-wcp][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
2148-
"[pq-vks-snapshot] Create Volume from snapshot with different size", ginkgo.Label(p1, block,
2148+
"Create Volume from snapshot with different size", ginkgo.Label(p1, block,
21492149
vanilla, snapshot, tkg, wcp, stable, negative, vc90), func() {
21502150

21512151
ctx, cancel := context.WithCancel(context.Background())
@@ -2538,7 +2538,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
25382538
6. Run cleanup - delete the snapshots and then delete pv
25392539
*/
25402540
ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
2541-
"[pq-vks-snapshot] Volume deletion with existing snapshots", ginkgo.Label(p0, block, vanilla, snapshot,
2541+
"Volume deletion with existing snapshots", ginkgo.Label(p0, block, vanilla, snapshot,
25422542
tkg, wcp, stable, negative, vc80), func() {
25432543

25442544
ctx, cancel := context.WithCancel(context.Background())
@@ -2733,7 +2733,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
27332733
(note the snapshotHandle its pointing to has been deleted)
27342734
9. Volume Create should fail with an appropriate error on k8s side
27352735
*/
2736-
ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot][pq-vks-snapshot] Pre-provisioned snapshot using "+
2736+
ginkgo.It("[ef-vanilla-block][block-vanilla-snapshot] Pre-provisioned snapshot using "+
27372737
"incorrect/non-existing static snapshot", ginkgo.Label(p0, block, vanilla, snapshot, negative, vc80), func() {
27382738

27392739
ctx, cancel := context.WithCancel(context.Background())
@@ -3185,7 +3185,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
31853185
7. Cleanup the pvc
31863186
*/
31873187
ginkgo.It("[ef-wcp-snapshot][cf-vanilla-block][block-vanilla-snapshot] [tkg-snapshot]"+
3188-
"[supervisor-snapshot][pq-vks-snapshot] Verify offline resize of a volume having snapshots", ginkgo.Label(p0, block,
3188+
"[supervisor-snapshot] Verify offline resize of a volume having snapshots", ginkgo.Label(p0, block,
31893189
vanilla, tkg, snapshot, stable, wcp, negative, vc90), func() {
31903190

31913191
ctx, cancel := context.WithCancel(context.Background())
@@ -3366,7 +3366,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
33663366
7. Cleanup the pvc
33673367
*/
33683368
ginkgo.It("[ef-vanilla-block][ef-wcp-snapshot][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot]"+
3369-
"[pq-vks-snapshot] Volume online resize of a volume having snapshots", ginkgo.Label(p0, block, vanilla,
3369+
"Volume online resize of a volume having snapshots", ginkgo.Label(p0, block, vanilla,
33703370
tkg, snapshot, stable, negative, vc90), func() {
33713371

33723372
ctx, cancel := context.WithCancel(context.Background())
@@ -3603,7 +3603,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
36033603
8. cleanup the snapshots, restore-pvc and source-pvc
36043604
*/
36053605

3606-
ginkgo.It("[pq-wcp-neg-snpt][block-vanilla-snapshot][supervisor-snapshot][pq-vks-snapshot] Snapshot restore "+
3606+
ginkgo.It("[pq-wcp-neg-snpt][block-vanilla-snapshot][supervisor-snapshot] Snapshot restore "+
36073607
"while the Host is Down", ginkgo.Label(p2, block, vanilla, snapshot, disruptive, vc80), func() {
36083608
ctx, cancel := context.WithCancel(context.Background())
36093609
defer cancel()
@@ -3777,7 +3777,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
37773777
9. Delete both deployments and. the pvcs
37783778
*/
37793779

3780-
ginkgo.It("[pq-wcp-neg-snpt][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot][pq-vks-snapshot] VC reboot "+
3780+
ginkgo.It("[pq-wcp-neg-snpt][block-vanilla-snapshot][tkg-snapshot][supervisor-snapshot] VC reboot "+
37813781
"with deployment pvcs having snapshot", ginkgo.Label(p1, block, vanilla, tkg, snapshot, disruptive,
37823782
negative, flaky, vc90), func() {
37833783

@@ -4745,7 +4745,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
47454745
3. Expected behavior: resize operation should succeed and the
47464746
snapshot creation should succeed after resize completes
47474747
*/
4748-
ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot][pq-vks-snapshot] Volume "+
4748+
ginkgo.It("[ef-wcp-snapshot][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot] Volume "+
47494749
"snapshot creation when resize is in progress", ginkgo.Label(p2, block,
47504750
vanilla, snapshot, vc80), func() {
47514751

@@ -6882,7 +6882,7 @@ var _ = ginkgo.Describe("Volume Snapshot Basic Test", func() {
68826882
b) snapshot create/delete workflow
68836883
c) Restart services
68846884
*/
6885-
ginkgo.It("[ef-f-wcp-snapshot][tkg-snapshot][supervisor-snapshot][pq-vks-snapshot] Scale up snapshot creation by "+
6885+
ginkgo.It("[ef-f-wcp-snapshot][tkg-snapshot][supervisor-snapshot] Scale up snapshot creation by "+
68866886
"increasing the volume counts and in between restart services", ginkgo.Label(p1, snapshot, tkg, vc90), func() {
68876887

68886888
ctx, cancel := context.WithCancel(context.Background())

‎tests/e2e/csi_snapshot_negative.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ var _ = ginkgo.Describe("[block-snapshot-negative] Volume Snapshot Fault-Injecti
254254
as run a scenario with improved_idempotency disabled
255255
*/
256256
ginkgo.It("[pq-wcp-neg-snpt][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot]"+
257-
"[pq-vks-snapshot] create volume snapshot when hostd goes down", ginkgo.Label(p1, block, vanilla, tkg, snapshot,
257+
"create volume snapshot when hostd goes down", ginkgo.Label(p1, block, vanilla, tkg, snapshot,
258258
disruptive, negative, vc90), func() {
259259

260260
serviceName = hostdServiceName
@@ -272,7 +272,7 @@ var _ = ginkgo.Describe("[block-snapshot-negative] Volume Snapshot Fault-Injecti
272272
})
273273

274274
ginkgo.It("[pq-wcp-neg-snpt][block-vanilla-snapshot] [tkg-snapshot][supervisor-snapshot]"+
275-
"[pq-vks-snapshot] create volume snapshot when VPXD goes down", ginkgo.Label(p1, block, vanilla,
275+
"create volume snapshot when VPXD goes down", ginkgo.Label(p1, block, vanilla,
276276
tkg, snapshot, disruptive, vc90), func() {
277277

278278
serviceName = vpxdServiceName

‎tests/e2e/gc_block_resize_retain_policy.go‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,12 @@ var _ = ginkgo.Describe("[csi-guest][ef-vks] [ef-vks-n1][ef-vks-n2] Volume Expan
310310
ginkgo.By("Checking for resize on SVC PV")
311311
verifyPVSizeinSupervisor(svcPVCName, newSize)
312312

313-
ginkgo.By("Checking for conditions on pvc")
314-
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
315-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
313+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
314+
if !isPrivateNetwork {
315+
ginkgo.By("Checking for conditions on pvc")
316+
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
317+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
318+
}
316319

317320
ginkgo.By("Checking for 'FileSystemResizePending' status condition on SVC PVC")
318321
_, err = checkSvcPvcHasGivenStatusCondition(svcPVCName, true, v1.PersistentVolumeClaimFileSystemResizePending)
@@ -539,10 +542,13 @@ var _ = ginkgo.Describe("[csi-guest][ef-vks] [ef-vks-n1][ef-vks-n2] Volume Expan
539542
ginkgo.By("Checking for resize on SVC PV")
540543
verifyPVSizeinSupervisor(svcPVCName, newSize)
541544

542-
ginkgo.By("Checking for conditions on pvc")
543-
pvcNew, err = waitForPVCToReachFileSystemResizePendingCondition(clientNewGc,
544-
namespaceNewGC, pvcNew.Name, pollTimeout)
545-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
545+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
546+
if !isPrivateNetwork {
547+
ginkgo.By("Checking for conditions on pvc")
548+
pvcNew, err = waitForPVCToReachFileSystemResizePendingCondition(clientNewGc,
549+
namespaceNewGC, pvcNew.Name, pollTimeout)
550+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
551+
}
546552

547553
ginkgo.By("Checking for 'FileSystemResizePending' status condition on SVC PVC")
548554
_, err = checkSvcPvcHasGivenStatusCondition(svcPVCName, true, v1.PersistentVolumeClaimFileSystemResizePending)
@@ -1085,6 +1091,13 @@ var _ = ginkgo.Describe("[csi-guest][ef-vks] [ef-vks-n1][ef-vks-n2] Volume Expan
10851091
pvcNew, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvcNew.Name, pollTimeout)
10861092
gomega.Expect(err).NotTo(gomega.HaveOccurred())
10871093

1094+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
1095+
if !isPrivateNetwork {
1096+
ginkgo.By("Checking for conditions on pvc")
1097+
pvcNew, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvcNew.Name, pollTimeout)
1098+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1099+
}
1100+
10881101
ginkgo.By("Deleting the gc PVC")
10891102
err = fpv.DeletePersistentVolumeClaim(ctx, client, pvcNew.Name, namespace)
10901103
gomega.Expect(err).NotTo(gomega.HaveOccurred())

‎tests/e2e/gc_block_volume_expansion.go‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,12 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
292292
err = waitForSvcPvcToReachFileSystemResizePendingCondition(ctx, svcPVCName, pollTimeout)
293293
gomega.Expect(err).NotTo(gomega.HaveOccurred())
294294

295-
ginkgo.By("Checking for conditions on pvc")
296-
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
297-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
295+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
296+
if !isPrivateNetwork {
297+
ginkgo.By("Checking for conditions on pvc")
298+
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
299+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
300+
}
298301

299302
ginkgo.By(fmt.Sprintf("Invoking QueryCNSVolumeWithResult with VolumeID: %s", volHandle))
300303
queryResult, err := e2eVSphere.queryCNSVolumeWithResult(volHandle)
@@ -543,9 +546,12 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
543546
err = waitForSvcPvcToReachFileSystemResizePendingCondition(ctx, svcPVCName, pollTimeout)
544547
gomega.Expect(err).NotTo(gomega.HaveOccurred())
545548

546-
ginkgo.By("Checking for conditions on pvc")
547-
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
548-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
549+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
550+
if !isPrivateNetwork {
551+
ginkgo.By("Checking for conditions on pvc")
552+
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
553+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
554+
}
549555

550556
ginkgo.By(fmt.Sprintf("Invoking QueryCNSVolumeWithResult with VolumeID: %s", volHandle))
551557
queryResult, err := e2eVSphere.queryCNSVolumeWithResult(volHandle)
@@ -677,9 +683,12 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
677683
err = waitForSvcPvcToReachFileSystemResizePendingCondition(ctx, svcPVCName, pollTimeout)
678684
gomega.Expect(err).NotTo(gomega.HaveOccurred())
679685

680-
ginkgo.By("Checking for conditions on pvc")
681-
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
682-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
686+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
687+
if !isPrivateNetwork {
688+
ginkgo.By("Checking for conditions on pvc")
689+
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
690+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
691+
}
683692

684693
ginkgo.By(fmt.Sprintf("Invoking QueryCNSVolumeWithResult with VolumeID: %s", volHandle))
685694
queryResult, err := e2eVSphere.queryCNSVolumeWithResult(volHandle)
@@ -775,9 +784,12 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
775784
err = waitForSvcPvcToReachFileSystemResizePendingCondition(ctx, svcPVCName, pollTimeout)
776785
gomega.Expect(err).NotTo(gomega.HaveOccurred())
777786

778-
ginkgo.By("Checking for conditions on pvc")
779-
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
780-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
787+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
788+
if !isPrivateNetwork {
789+
ginkgo.By("Checking for conditions on pvc")
790+
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
791+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
792+
}
781793

782794
ginkgo.By(fmt.Sprintf("Invoking QueryCNSVolumeWithResult with VolumeID: %s", volHandle))
783795
queryResult, err := e2eVSphere.queryCNSVolumeWithResult(volHandle)
@@ -1053,9 +1065,12 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
10531065
err = waitForSvcPvcToReachFileSystemResizePendingCondition(ctx, svcPVCName, pollTimeout)
10541066
gomega.Expect(err).NotTo(gomega.HaveOccurred())
10551067

1056-
ginkgo.By("Checking for conditions on pvc")
1057-
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
1058-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1068+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
1069+
if !isPrivateNetwork {
1070+
ginkgo.By("Checking for conditions on pvc")
1071+
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
1072+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1073+
}
10591074

10601075
ginkgo.By(fmt.Sprintf("Invoking QueryCNSVolumeWithResult with VolumeID: %s", volHandle))
10611076
queryResult, err := e2eVSphere.queryCNSVolumeWithResult(volHandle)
@@ -2295,9 +2310,12 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
22952310
err = waitForSvcPvcToReachFileSystemResizePendingCondition(ctx, svcPVCName, pollTimeout)
22962311
gomega.Expect(err).NotTo(gomega.HaveOccurred())
22972312

2298-
ginkgo.By("Checking for conditions on pvc")
2299-
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
2300-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2313+
isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
2314+
if !isPrivateNetwork {
2315+
ginkgo.By("Checking for conditions on pvc")
2316+
pvclaim, err = waitForPVCToReachFileSystemResizePendingCondition(client, namespace, pvclaim.Name, pollTimeout)
2317+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
2318+
}
23012319

23022320
ginkgo.By(fmt.Sprintf("Invoking QueryCNSVolumeWithResult with VolumeID: %s", volHandle))
23032321
queryResult, err := e2eVSphere.queryCNSVolumeWithResult(volHandle)

‎tests/e2e/improved_csi_idempotency.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
204204
6. Verify no orphan volumes are left
205205
*/
206206
ginkgo.It("[stable-pq-vks][csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file]"+
207-
"[pq-vanilla-block][pq-vks][pq-vks-n1][pq-vks-n2] create volume when hostd service goes down - "+
207+
"[pq-vanilla-block] create volume when hostd service goes down - "+
208208
"idempotency", ginkgo.Label(p0, disruptive, block, file, windows, wcp, tkg, vanilla, vc70), func() {
209209
serviceName = hostdServiceName
210210
createVolumeWithServiceDown(serviceName, namespace, client, storagePolicyName,
@@ -240,7 +240,7 @@ var _ = ginkgo.Describe("Improved CSI Idempotency Tests", func() {
240240
7. Verify no orphan volumes are left
241241
*/
242242
ginkgo.It("[stable-pq-vks][csi-block-vanilla][csi-file-vanilla][csi-guest][csi-supervisor][pq-vanilla-file]"+
243-
"[pq-vanilla-block][pq-vks][pq-vks-n1][pq-vks-n2] create volume when VPXD goes down - "+
243+
"[pq-vanilla-block] create volume when VPXD goes down - "+
244244
"idempotency", ginkgo.Label(p0, disruptive, block, file, windows, wcp, tkg, vanilla, vc70), func() {
245245
serviceName = vpxdServiceName
246246
createVolumeWithServiceDown(serviceName, namespace, client, storagePolicyName,

‎tests/e2e/vc_reboot_volume_lifecycle.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ var _ bool = ginkgo.Describe("Verify volume life_cycle operations works fine aft
9898
*/
9999

100100
ginkgo.It("[ef-f-stretched-svc][pq-f-wcp][csi-block-vanilla][csi-supervisor][csi-guest][csi-block-vanilla-serialized]"+
101-
"[stretched-svc][pq-vanilla-block][pq-vks][pq-vks-n1][pq-vks-n2] verify volume operations on VC works fine after vc "+
101+
"[stretched-svc][pq-vanilla-block] verify volume operations on VC works fine after vc "+
102102
"reboots", ginkgo.Label(p1, block, wcp, vanilla, tkg, core, vc70), func() {
103103
ctx, cancel := context.WithCancel(context.Background())
104104
defer cancel()

0 commit comments

Comments
 (0)