Skip to content

Commit 224a0e7

Browse files
YashasG98YashwantGohokar
YashasG98
authored and
YashwantGohokar
committed
Changes to parallelise e2e test runs
1 parent 0864fa2 commit 224a0e7

File tree

159 files changed

+16156
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+16156
-304
lines changed

‎hack/run_e2e_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ check-env "FSS_VOLUME_HANDLE" $FSS_VOLUME_HANDLE
3030
check-env "MNT_TARGET_ID" $MNT_TARGET_ID
3131
check-env "MNT_TARGET_SUBNET_ID" $MNT_TARGET_SUBNET_ID
3232
check-env "MNT_TARGET_COMPARTMENT_ID" $MNT_TARGET_COMPARTMENT_ID
33+
check-env "ENABLE_PARALLEL_RUN" $ENABLE_PARALLEL_RUN
3334
check-env "RUN_UHP_E2E" $RUN_UHP_E2E
3435

3536

@@ -59,6 +60,7 @@ function run_e2e_tests_existing_cluster() {
5960
--architecture=${ARCHITECTURE} \
6061
--volume-handle=${FSS_VOLUME_HANDLE} \
6162
--static-snapshot-compartment-id=${STATIC_SNAPSHOT_COMPARTMENT_ID} \
63+
--enable-parallel-run=${ENABLE_PARALLEL_RUN} \
6264
--run-uhp-e2e=${RUN_UHP_E2E}
6365
retval=$?
6466
return $retval

‎test/e2e/cloud-provider-oci/block_volume_creation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ var _ = Describe("Block Volume Creation", func() {
3535
It("Should be possible to create a persistent volume claim (PVC) for a block storage of Ext3 file system ", func() {
3636
pvcJig := framework.NewPVCTestJig(f.ClientSet, "volume-provisioner-e2e-tests-pvc")
3737

38-
scName := f.CreateStorageClassOrFail(framework.ClassOCIExt3, core.ProvisionerNameDefault, map[string]string{block.FSType: "ext3"}, pvcJig.Labels, "", false, "Delete", nil)
38+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, core.ProvisionerNameDefault, map[string]string{block.FSType: "ext3"}, pvcJig.Labels, "", false, "Delete", nil)
3939
f.StorageClasses = append(f.StorageClasses, scName)
4040
pvc := pvcJig.CreateAndAwaitPVCOrFail(f.Namespace.Name, framework.MinVolumeBlock, scName, setupF.AdLabel, nil)
4141
f.VolumeIds = append(f.VolumeIds, pvc.Spec.VolumeName)
42-
_ = f.DeleteStorageClass(framework.ClassOCIExt3)
42+
_ = f.DeleteStorageClass(f.Namespace.Name)
4343
})
4444

4545
It("Should be possible to create a persistent volume claim (PVC) for a block storage with no AD specified ", func() {

‎test/e2e/cloud-provider-oci/csi_snapshot_restore.go

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ var _ = Describe("Snapshot Creation and Restore", func() {
7070
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
7171
pvcJig.InitialiseSnapClient(f.SnapClientSet)
7272

73-
scName := f.CreateStorageClassOrFail(framework.ClassSnapshot, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
73+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
7474
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
7575

7676
_ = pvcJig.NewPodForCSI("pod-original", f.Namespace.Name, pvc.Name, setupF.AdLabel)
7777

7878
time.Sleep(60 * time.Second) //waiting for pod to up and running
7979

80-
vscName := f.CreateVolumeSnapshotClassOrFail(framework.VSClassDefault, BVDriverName, vscParams, ReclaimPolicyDelete)
80+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
8181
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
8282

8383
pvcRestore := pvcJig.CreateAndAwaitPVCOrFailSnapshotSource(f.Namespace.Name, framework.MaxVolumeBlock, scName, vs.Name, v1.ClaimPending, nil)
@@ -88,8 +88,8 @@ var _ = Describe("Snapshot Creation and Restore", func() {
8888
pvcJig.CheckUsableVolumeSizeInsidePod(f.Namespace.Name, podRestoreName, "99G")
8989

9090
f.VolumeIds = append(f.VolumeIds, pvc.Spec.VolumeName)
91-
_ = f.DeleteVolumeSnapshotClass(framework.VSClassDefault)
92-
_ = f.DeleteStorageClass(framework.ClassSnapshot)
91+
_ = f.DeleteVolumeSnapshotClass(f.Namespace.Name)
92+
_ = f.DeleteStorageClass(f.Namespace.Name)
9393
})
9494
It("FS should get expanded when a PVC is restored with a lesser size backup (paravirtualized)", func() {
9595
checkOrInstallCRDs(f)
@@ -98,14 +98,14 @@ var _ = Describe("Snapshot Creation and Restore", func() {
9898
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
9999
pvcJig.InitialiseSnapClient(f.SnapClientSet)
100100

101-
scName := f.CreateStorageClassOrFail(framework.ClassSnapshot, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
101+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
102102
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
103103

104104
_ = pvcJig.NewPodForCSI("pod-original", f.Namespace.Name, pvc.Name, setupF.AdLabel)
105105

106106
time.Sleep(60 * time.Second) //waiting for pod to up and running
107107

108-
vscName := f.CreateVolumeSnapshotClassOrFail(framework.VSClassDefault, BVDriverName, vscParams, ReclaimPolicyDelete)
108+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
109109
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
110110

111111
pvcRestore := pvcJig.CreateAndAwaitPVCOrFailSnapshotSource(f.Namespace.Name, framework.MaxVolumeBlock, scName, vs.Name, v1.ClaimPending, nil)
@@ -116,8 +116,8 @@ var _ = Describe("Snapshot Creation and Restore", func() {
116116
pvcJig.CheckUsableVolumeSizeInsidePod(f.Namespace.Name, podRestoreName, "99G")
117117

118118
f.VolumeIds = append(f.VolumeIds, pvc.Spec.VolumeName)
119-
_ = f.DeleteVolumeSnapshotClass(framework.VSClassDefault)
120-
_ = f.DeleteStorageClass(framework.ClassSnapshot)
119+
_ = f.DeleteVolumeSnapshotClass(f.Namespace.Name)
120+
_ = f.DeleteStorageClass(f.Namespace.Name)
121121
})
122122
It("Should be able to create and restore a snapshot from a backup(static case)", func() {
123123
checkOrInstallCRDs(f)
@@ -127,10 +127,10 @@ var _ = Describe("Snapshot Creation and Restore", func() {
127127
pvcJig.InitialiseSnapClient(f.SnapClientSet)
128128

129129
//creating a snapshot dynamically
130-
scName := f.CreateStorageClassOrFail(framework.ClassSnapshot, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
130+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
131131
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
132132
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommand)
133-
vscName := f.CreateVolumeSnapshotClassOrFail(framework.VSClassDefault, BVDriverName, vscParams, ReclaimPolicyDelete)
133+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
134134
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
135135

136136
//Waiting for volume snapshot content to be created and status field to be populated
@@ -142,7 +142,7 @@ var _ = Describe("Snapshot Creation and Restore", func() {
142142

143143
//creating a snapshot statically using the backup provisioned dynamically
144144
restoreVsName := "e2e-restore-vs"
145-
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail("e2e-snapshot-vsc", BVDriverName, backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name)
145+
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name + "-e2e-snapshot-vsc", BVDriverName, backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name)
146146

147147
pvcJig.CreateAndAwaitVolumeSnapshotStaticOrFail(restoreVsName, f.Namespace.Name, vscontentName)
148148

@@ -152,8 +152,8 @@ var _ = Describe("Snapshot Creation and Restore", func() {
152152
pvcJig.CheckFileExists(f.Namespace.Name, podRestoreName, "/usr/share/nginx/html", "testdata.txt")
153153

154154
f.VolumeIds = append(f.VolumeIds, pvc.Spec.VolumeName)
155-
_ = f.DeleteVolumeSnapshotClass(framework.VSClassDefault)
156-
_ = f.DeleteStorageClass(framework.ClassSnapshot)
155+
_ = f.DeleteVolumeSnapshotClass(f.Namespace.Name)
156+
_ = f.DeleteStorageClass(f.Namespace.Name)
157157
})
158158
It("Should be able to create a snapshot and restore from a backup in another compartment", func() {
159159
checkOrInstallCRDs(f)
@@ -167,11 +167,11 @@ var _ = Describe("Snapshot Creation and Restore", func() {
167167

168168
backupOCID := pvcJig.CreateVolumeBackup(f.BlockStorageClient, setupF.AdLabel, setupF.StaticSnapshotCompartmentOcid, *volId, "test-backup")
169169

170-
scName := f.CreateStorageClassOrFail(framework.ClassSnapshot, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
170+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
171171

172172
//creating a snapshot statically using the backup provisioned dynamically
173173
restoreVsName := "e2e-restore-vs"
174-
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail("e2e-snapshot-vsc", BVDriverName, *backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name)
174+
vscontentName := pvcJig.CreateVolumeSnapshotContentOrFail(f.Namespace.Name + "-e2e-snapshot-vsc", BVDriverName, *backupOCID, ReclaimPolicyDelete, restoreVsName, f.Namespace.Name)
175175

176176
pvcJig.CreateAndAwaitVolumeSnapshotStaticOrFail(restoreVsName, f.Namespace.Name, vscontentName)
177177

@@ -186,8 +186,8 @@ var _ = Describe("Snapshot Creation and Restore", func() {
186186
pvcJig.DeleteVolumeBackup(f.BlockStorageClient, *backupOCID)
187187

188188
f.VolumeIds = append(f.VolumeIds, *volId)
189-
_ = f.DeleteVolumeSnapshotClass(framework.VSClassDefault)
190-
_ = f.DeleteStorageClass(framework.ClassSnapshot)
189+
_ = f.DeleteVolumeSnapshotClass(f.Namespace.Name)
190+
_ = f.DeleteStorageClass(f.Namespace.Name)
191191
})
192192
})
193193
})
@@ -204,12 +204,12 @@ var _ = Describe("Volume Snapshot Deletion Tests", func() {
204204
scParams := map[string]string{framework.AttachmentType: framework.AttachmentTypeISCSI}
205205
vscParams := map[string]string{framework.BackupType: framework.BackupTypeFull}
206206

207-
scName := f.CreateStorageClassOrFail(framework.ClassSnapshot, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
207+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
208208
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
209209

210210
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommand)
211211

212-
vscName := f.CreateVolumeSnapshotClassOrFail(framework.VSClassDefault, BVDriverName, vscParams, ReclaimPolicyDelete)
212+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
213213
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
214214

215215
//Waiting for volume snapshot content to be created and status field to be populated
@@ -230,8 +230,8 @@ var _ = Describe("Volume Snapshot Deletion Tests", func() {
230230
}
231231

232232
f.VolumeIds = append(f.VolumeIds, pvc.Spec.VolumeName)
233-
_ = f.DeleteVolumeSnapshotClass(framework.VSClassDefault)
234-
_ = f.DeleteStorageClass(framework.ClassSnapshot)
233+
_ = f.DeleteVolumeSnapshotClass(f.Namespace.Name)
234+
_ = f.DeleteStorageClass(f.Namespace.Name)
235235
})
236236
It("Test VSContent not deleted when reclaim policy is Retain", func() {
237237
checkOrInstallCRDs(f)
@@ -241,12 +241,12 @@ var _ = Describe("Volume Snapshot Deletion Tests", func() {
241241
scParams := map[string]string{framework.AttachmentType: framework.AttachmentTypeISCSI}
242242
vscParams := map[string]string{framework.BackupType: framework.BackupTypeFull}
243243

244-
scName := f.CreateStorageClassOrFail(framework.ClassSnapshot, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
244+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
245245
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
246246

247247
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommand)
248248

249-
vscName := f.CreateVolumeSnapshotClassOrFail(framework.VSClassDefault, BVDriverName, vscParams, ReclaimPolicyRetain)
249+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyRetain)
250250
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
251251

252252
//Waiting for volume snapshot content to be created and status field to be populated
@@ -278,8 +278,8 @@ var _ = Describe("Volume Snapshot Deletion Tests", func() {
278278
pvcJig.DeleteVolumeBackup(f.BlockStorageClient, backupId)
279279

280280
f.VolumeIds = append(f.VolumeIds, pvc.Spec.VolumeName)
281-
_ = f.DeleteVolumeSnapshotClass(framework.VSClassDefault)
282-
_ = f.DeleteStorageClass(framework.ClassSnapshot)
281+
_ = f.DeleteVolumeSnapshotClass(f.Namespace.Name)
282+
_ = f.DeleteStorageClass(f.Namespace.Name)
283283
})
284284
})
285285
})
@@ -289,15 +289,15 @@ func testSnapshotAndRestore(f *framework.CloudProviderFramework, scParams map[st
289289
pvcJig := framework.NewPVCTestJig(f.ClientSet, "csi-snapshot-restore-e2e-tests")
290290
pvcJig.InitialiseSnapClient(f.SnapClientSet)
291291

292-
scName := f.CreateStorageClassOrFail(framework.ClassSnapshot, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
292+
scName := f.CreateStorageClassOrFail(f.Namespace.Name, BVDriverName, scParams, pvcJig.Labels, BindingModeWaitForFirstConsumer, true, ReclaimPolicyDelete, nil)
293293
pvc := pvcJig.CreateAndAwaitPVCOrFailCSI(f.Namespace.Name, framework.MinVolumeBlock, scName, nil, v1.PersistentVolumeFilesystem, v1.ReadWriteOnce, v1.ClaimPending)
294294

295295
_ = pvcJig.CreateAndAwaitNginxPodOrFail(f.Namespace.Name, pvc, WriteCommand)
296296

297297
// Waiting to be sure write command runs
298298
time.Sleep(30 * time.Second)
299299

300-
vscName := f.CreateVolumeSnapshotClassOrFail(framework.VSClassDefault, BVDriverName, vscParams, ReclaimPolicyDelete)
300+
vscName := f.CreateVolumeSnapshotClassOrFail(f.Namespace.Name, BVDriverName, vscParams, ReclaimPolicyDelete)
301301
vs := pvcJig.CreateAndAwaitVolumeSnapshotOrFail(f.Namespace.Name, vscName, pvc.Name, nil)
302302

303303
pvcRestore := pvcJig.CreateAndAwaitPVCOrFailSnapshotSource(f.Namespace.Name, framework.MinVolumeBlock, scName, vs.Name, v1.ClaimPending, nil)
@@ -306,8 +306,8 @@ func testSnapshotAndRestore(f *framework.CloudProviderFramework, scParams map[st
306306
pvcJig.CheckFileExists(f.Namespace.Name, podRestoreName, "/usr/share/nginx/html", "testdata.txt")
307307

308308
f.VolumeIds = append(f.VolumeIds, pvc.Spec.VolumeName)
309-
_ = f.DeleteVolumeSnapshotClass(framework.VSClassDefault)
310-
_ = f.DeleteStorageClass(framework.ClassSnapshot)
309+
_ = f.DeleteVolumeSnapshotClass(f.Namespace.Name)
310+
_ = f.DeleteStorageClass(f.Namespace.Name)
311311
}
312312

313313
func checkOrInstallCRDs(f *framework.CloudProviderFramework) {

0 commit comments

Comments
 (0)