From 33a7db301e0c2ef491e4779e4c682a00c26884d3 Mon Sep 17 00:00:00 2001 From: David Byron <82477955+dbyron-sf@users.noreply.github.com> Date: Tue, 25 Jun 2024 08:03:52 -0700 Subject: [PATCH] fix(integration/test): increase container startup time (#4754) to avoid failures like https://github.com/spinnaker/orca/actions/runs/9507661382/job/26207523266 PostgresMigrationContainerTest > testHealthCheckWithPostgres() FAILED org.testcontainers.containers.ContainerLaunchException: Container startup failed for image us-docker.pkg.dev/spinnaker-community/docker/orca:8.36.3-dev-release-1.32.x-3f8965d03-202406101625-unvalidated also changing the timeout in BaseContainerTest to avoid failures testing locally. --- .../test/java/com/netflix/spinnaker/orca/BaseContainerTest.java | 2 +- .../netflix/spinnaker/orca/PostgresMigrationContainerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/orca-integration/src/test/java/com/netflix/spinnaker/orca/BaseContainerTest.java b/orca-integration/src/test/java/com/netflix/spinnaker/orca/BaseContainerTest.java index a0643f65e2..2389b6d624 100644 --- a/orca-integration/src/test/java/com/netflix/spinnaker/orca/BaseContainerTest.java +++ b/orca-integration/src/test/java/com/netflix/spinnaker/orca/BaseContainerTest.java @@ -62,7 +62,7 @@ void init(TestInfo testInfo) throws Exception { new GenericContainer(dockerImageName) .withNetwork(network) .withExposedPorts(ORCA_PORT) - .waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(120))); + .waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(150))); } void testHealthCheck() throws Exception { diff --git a/orca-integration/src/test/java/com/netflix/spinnaker/orca/PostgresMigrationContainerTest.java b/orca-integration/src/test/java/com/netflix/spinnaker/orca/PostgresMigrationContainerTest.java index 536eafe62b..2e8cd574e3 100644 --- a/orca-integration/src/test/java/com/netflix/spinnaker/orca/PostgresMigrationContainerTest.java +++ b/orca-integration/src/test/java/com/netflix/spinnaker/orca/PostgresMigrationContainerTest.java @@ -76,7 +76,7 @@ void setup() throws Exception { new GenericContainer(previousDockerImageName) .withNetwork(network) .withExposedPorts(ORCA_PORT) - .waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(120))) + .waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(150))) .dependsOn(postgres) .withEnv("SPRING_APPLICATION_JSON", getSpringApplicationJson()); orcaInitialContainer.start();