From c208a7b753be153efe5f7d77a50480d996ffb8c4 Mon Sep 17 00:00:00 2001 From: Saikat Roychowdhury Date: Tue, 3 May 2022 05:23:28 +0000 Subject: [PATCH] honor the framework delete timeout for pv --- test/e2e/framework/timeouts.go | 2 +- test/e2e/storage/framework/volume_resource.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/framework/timeouts.go b/test/e2e/framework/timeouts.go index 3dbbcab9ad45..ac636ddd76d0 100644 --- a/test/e2e/framework/timeouts.go +++ b/test/e2e/framework/timeouts.go @@ -31,7 +31,7 @@ const ( pvReclaimTimeout = 3 * time.Minute pvBoundTimeout = 3 * time.Minute pvCreateTimeout = 3 * time.Minute - pvDeleteTimeout = 3 * time.Minute + pvDeleteTimeout = 5 * time.Minute pvDeleteSlowTimeout = 20 * time.Minute snapshotCreateTimeout = 5 * time.Minute snapshotDeleteTimeout = 5 * time.Minute diff --git a/test/e2e/storage/framework/volume_resource.go b/test/e2e/storage/framework/volume_resource.go index 66b521692eca..e5c99a5c9e11 100644 --- a/test/e2e/storage/framework/volume_resource.go +++ b/test/e2e/storage/framework/volume_resource.go @@ -204,7 +204,7 @@ func (r *VolumeResource) CleanupResource() error { } if pv != nil { - err = e2epv.WaitForPersistentVolumeDeleted(f.ClientSet, pv.Name, 5*time.Second, 5*time.Minute) + err = e2epv.WaitForPersistentVolumeDeleted(f.ClientSet, pv.Name, 5*time.Second, f.Timeouts.PVDelete) if err != nil { cleanUpErrs = append(cleanUpErrs, fmt.Errorf( "persistent Volume %v not deleted by dynamic provisioner: %w", pv.Name, err))