From 5dc5eca02e71b69b6b86a0ec2fb5c16358f11c2b Mon Sep 17 00:00:00 2001 From: Urvashi Date: Tue, 3 Mar 2026 11:18:20 -0500 Subject: [PATCH 1/2] Increase timeout for cleanup for singular OCL suite We keep hitting the rate limiter while cleaning up, so increase the timeout to give our tests more time to cleanup without hitting the rate limiter or timing out. Signed-off-by: Urvashi --- test/e2e-ocl/helpers_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e-ocl/helpers_test.go b/test/e2e-ocl/helpers_test.go index 79bf074aef..7fca46d540 100644 --- a/test/e2e-ocl/helpers_test.go +++ b/test/e2e-ocl/helpers_test.go @@ -314,13 +314,14 @@ func cleanupEphemeralBuildObjects(t *testing.T, cs *framework.ClientSet) { require.NoError(t, err) // Helper function to create a fresh timeout context for each resource verification. - // Each resource gets its own 2-minute timeout to prevent slow deletions from - // consuming the timeout budget of other resources. Use a slower poll interval - // (3s instead of 1s) to reduce API call rate and avoid rate limiting. + // Each resource gets its own 3-minute timeout to prevent slow deletions from + // consuming the timeout budget of other resources. Use a 5-second poll interval + // to significantly reduce API call rate and avoid exhausting the rate limiter + // (~36 attempts per resource, vs 120 attempts with 1s interval). newCleanupAssertion := func() *helpers.Assertions { - ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) t.Cleanup(cancel) - return helpers.AssertClientSet(t, cs).WithContext(ctx).WithPollInterval(3 * time.Second).Eventually() + return helpers.AssertClientSet(t, cs).WithContext(ctx).WithPollInterval(5 * time.Second).Eventually() } if len(secretList.Items) == 0 { From efe0cce8a056fb1ca70e0ebaef4462dbdb680e44 Mon Sep 17 00:00:00 2001 From: Urvashi Date: Tue, 3 Mar 2026 11:21:43 -0500 Subject: [PATCH 2/2] Increase timeout + interval for OCL test cleanup We keep hitting the rate limiter intermittently so increase the interval between polling and the overall timeout for the cleanup process to avoid this from happening. Signed-off-by: Urvashi --- test/e2e-ocl-shared/helpers.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e-ocl-shared/helpers.go b/test/e2e-ocl-shared/helpers.go index e275772f09..f58c03bd31 100644 --- a/test/e2e-ocl-shared/helpers.go +++ b/test/e2e-ocl-shared/helpers.go @@ -315,13 +315,14 @@ func CleanupEphemeralBuildObjects(t *testing.T, cs *framework.ClientSet) { require.NoError(t, err) // Helper function to create a fresh timeout context for each resource verification. - // Each resource gets its own 2-minute timeout to prevent slow deletions from - // consuming the timeout budget of other resources. Use a slower poll interval - // (3s instead of 1s) to reduce API call rate and avoid rate limiting. + // Each resource gets its own 3-minute timeout to prevent slow deletions from + // consuming the timeout budget of other resources. Use a 5-second poll interval + // to significantly reduce API call rate and avoid exhausting the rate limiter + // (~36 attempts per resource, vs 120 attempts with 1s interval). newCleanupAssertion := func() *helpers.Assertions { - ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) t.Cleanup(cancel) - return helpers.AssertClientSet(t, cs).WithContext(ctx).WithPollInterval(3 * time.Second).Eventually() + return helpers.AssertClientSet(t, cs).WithContext(ctx).WithPollInterval(5 * time.Second).Eventually() } if len(secretList.Items) == 0 {