From faddcc87e1b6b8eb5fdaa91055dd699be315d0e7 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Tue, 13 Oct 2026 19:04:34 +0000 Subject: [PATCH] fix(e2e): increase BSL availability timeout in three-BSLs test The BSL controller uses a single worker, so when it picks up a non-default BSL with a dummy CA certificate first, it blocks on TLS retry before reconciling the default BSL. With 2-of-3 BSLs carrying dummy certs, there is a ~67% probability the worker grabs a bad one first, causing the default BSL to miss the original 180s (3 min) timeout. Increase the timeout from 3 minutes to 5 minutes (300s) to give the controller enough headroom to work through the TLS-retrying BSLs before reaching the default one. Co-Authored-By: Claude Opus 4.6 --- tests/e2e/backup_restore_suite_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/e2e/backup_restore_suite_test.go b/tests/e2e/backup_restore_suite_test.go index caed71753ca..8414ed773f1 100755 --- a/tests/e2e/backup_restore_suite_test.go +++ b/tests/e2e/backup_restore_suite_test.go @@ -689,7 +689,12 @@ var _ = ginkgo.Describe("Multiple BSL with custom CA cert tests", ginkgo.Ordered } gomega.Expect(defaultBSL).NotTo(gomega.BeNil(), "Default BSL should exist") - // Only the default BSL needs to be available for the test + // Only the default BSL needs to be available for the test. + // Use 5 min instead of 3 min: the BSL controller has a single + // worker, so when it picks up a non-default BSL with a dummy CA + // cert first it blocks on TLS retry, delaying reconciliation of + // the default BSL beyond the original 180 s timeout (~67% chance + // with 2-of-3 BSLs carrying dummy certs). gomega.Eventually(func() bool { bsl := &velero.BackupStorageLocation{} err := dpaCR.Client.Get(context.Background(), client.ObjectKey{ @@ -700,7 +705,7 @@ var _ = ginkgo.Describe("Multiple BSL with custom CA cert tests", ginkgo.Ordered return false } return bsl.Status.Phase == velero.BackupStorageLocationPhaseAvailable - }, time.Minute*3, time.Second*5).Should(gomega.BeTrue(), "Default BSL should be available") + }, time.Minute*5, time.Second*5).Should(gomega.BeTrue(), "Default BSL should be available") log.Printf("Deploying test application") err = lib.InstallApplication(dpaCR.Client, "./sample-applications/nginx/nginx-deployment.yaml")