From 717207bce00deb3e534c2d8885787c04a19e2376 Mon Sep 17 00:00:00 2001 From: James Rasell Date: Thu, 24 Apr 2025 09:09:33 +0100 Subject: [PATCH] e2e: Fix TestDocker/testRedis with increased timeout on deployment (#25739) The fresh deployment of the Redis job took around 20s which is also the default context timeout on the e2e util that monitors and waits for a deployment to complete. The tight timing meant the test often timed out but sometimes would complete successfully. Increasing the timeout for this deployment will remove the flakiness. --- e2e/docker/docker_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/docker/docker_test.go b/e2e/docker/docker_test.go index d7133673e..e01a30443 100644 --- a/e2e/docker/docker_test.go +++ b/e2e/docker/docker_test.go @@ -53,9 +53,9 @@ func runRegistry(t *testing.T) { t.Logf("Setting up insecure private registry at %v", address) - // run the sed job to fixup the auth.json file with correct address and make - // sure the registry is marked as insecure for docker, otherwise pulls will - // fail + // run the sed job to fix the auth.json file with the correct address and + // make sure the registry is marked as insecure for docker, otherwise pulls + // will fail. _, sedCleanup := jobs3.Submit(t, "../docker_registry/registry-auths.hcl", jobs3.Var("registry_address", address), @@ -80,7 +80,7 @@ func runRegistry(t *testing.T) { } func testRedis(t *testing.T) { - job, cleanup := jobs3.Submit(t, "./input/redis.hcl") + job, cleanup := jobs3.Submit(t, "./input/redis.hcl", jobs3.Timeout(30*time.Second)) t.Cleanup(cleanup) logs := job.TaskLogs("cache", "redis")