From a6c45de93ea076741ddd1a555d2340b52b2e6fd2 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 23 Jan 2025 12:54:22 +0100 Subject: [PATCH] Adjust timeouts for LGTM container and tests Fixes #45774 (maybe...) --- .github/workflows/ci-actions-incremental.yml | 2 +- .../io/quarkus/observability/common/config/GrafanaConfig.java | 2 +- .../test/java/io/quarkus/observability/test/LgtmReloadTest.java | 2 +- .../src/test/resources/application.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index b1198cd0cd23a5..80a49b05592525 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -53,7 +53,7 @@ env: COMMON_MAVEN_ARGS: "-e -B --settings .github/mvn-settings.xml --fail-at-end" COMMON_TEST_MAVEN_ARGS: "-Dformat.skip -Denforcer.skip -DskipDocs -Dforbiddenapis.skip -DskipExtensionValidation -DskipCodestartValidation" NATIVE_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=6g -Dnative -Dnative.surefire.skip -Dno-descriptor-tests clean install -DskipDocs" - JVM_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dquarkus.test.hang-detection-timeout=60" + JVM_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dquarkus.test.hang-detection-timeout=300" PTS_MAVEN_ARGS: "-Ddevelocity.pts.enabled=${{ github.event_name == 'pull_request' && github.base_ref == 'main' && 'true' || 'false' }}" DB_USER: hibernate_orm_test DB_PASSWORD: hibernate_orm_test diff --git a/extensions/observability-devservices/common/src/main/java/io/quarkus/observability/common/config/GrafanaConfig.java b/extensions/observability-devservices/common/src/main/java/io/quarkus/observability/common/config/GrafanaConfig.java index 93cccae20c8322..8ae7e74bbccdae 100644 --- a/extensions/observability-devservices/common/src/main/java/io/quarkus/observability/common/config/GrafanaConfig.java +++ b/extensions/observability-devservices/common/src/main/java/io/quarkus/observability/common/config/GrafanaConfig.java @@ -29,6 +29,6 @@ public interface GrafanaConfig extends ContainerConfig { /** * The timeout. */ - @WithDefault("PT1M") + @WithDefault("PT2M") Duration timeout(); } diff --git a/integration-tests/observability-lgtm/src/test/java/io/quarkus/observability/test/LgtmReloadTest.java b/integration-tests/observability-lgtm/src/test/java/io/quarkus/observability/test/LgtmReloadTest.java index bbecad807b06ee..58eaba5abbface 100644 --- a/integration-tests/observability-lgtm/src/test/java/io/quarkus/observability/test/LgtmReloadTest.java +++ b/integration-tests/observability-lgtm/src/test/java/io/quarkus/observability/test/LgtmReloadTest.java @@ -35,7 +35,7 @@ public void testReload() { poke("/reload"); test.modifySourceFile(ReloadEndpoint.class, s -> s.replace("/reload", "/new")); poke("/new"); - test.modifyResourceFile("application.properties", s -> s.replace("timeout=PT1M", "timeout=PT2M")); + test.modifyResourceFile("application.properties", s -> s.replace("timeout=PT3M", "timeout=PT4M")); poke("/new"); } } diff --git a/integration-tests/observability-lgtm/src/test/resources/application.properties b/integration-tests/observability-lgtm/src/test/resources/application.properties index ed0590146060af..ca48403323e5e8 100644 --- a/integration-tests/observability-lgtm/src/test/resources/application.properties +++ b/integration-tests/observability-lgtm/src/test/resources/application.properties @@ -9,4 +9,4 @@ quarkus.micrometer.export.otlp.enabled=true quarkus.micrometer.export.otlp.publish=true quarkus.micrometer.export.otlp.step=PT5S -quarkus.observability.lgtm.timeout=PT1M \ No newline at end of file +quarkus.observability.lgtm.timeout=PT3M \ No newline at end of file