diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 2b1cf1f8527..29bd5c8b847 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -25,6 +25,6 @@ test { // overriding the default timeout of 9 minutes set in configure_tests.gradle, // as Gradle smoke tests might run for a longer duration - timeout = Duration.of(15, ChronoUnit.MINUTES) + timeout = Duration.of(20, ChronoUnit.MINUTES) } diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle index 2dedbc6f9b5..e201c265832 100644 --- a/dd-smoke-tests/maven/build.gradle +++ b/dd-smoke-tests/maven/build.gradle @@ -26,7 +26,7 @@ tasks.withType(Test).configureEach { // overriding the default timeout set in configure_tests.gradle, as Maven smoke // tests might run for a longer duration - timeout = Duration.of(20, ChronoUnit.MINUTES) + timeout = Duration.of(25, ChronoUnit.MINUTES) if (project.hasProperty("mavenRepositoryProxy")) { // propagate proxy URL to tests, to then propagate it to nested Gradle builds diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 79a3ad7f715..2ead886918b 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -46,6 +46,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { private static final String JAVAC_PLUGIN_VERSION = Config.get().ciVisibilityCompilerPluginVersion private static final String JACOCO_PLUGIN_VERSION = Config.get().ciVisibilityJacocoPluginVersion + private static final int DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS = 400 private static final int PROCESS_TIMEOUT_SECS = 120 private static final int DEPENDENCIES_DOWNLOAD_RETRIES = 5 @@ -293,7 +294,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { private void retryUntilSuccessfulOrNoAttemptsLeft(List mvnCommand, Map additionalEnvVars = [:]) { def processBuilder = createProcessBuilder(mvnCommand, false, false, [], additionalEnvVars) for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) { - def exitCode = runProcess(processBuilder.start()) + def exitCode = runProcess(processBuilder.start(), DEPENDENCIES_DOWNLOAD_TIMEOUT_SECS) if (exitCode == 0) { return } @@ -309,15 +310,15 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { return runProcess(processBuilder.start()) } - private static runProcess(Process p) { + private static runProcess(Process p, int timeout_secs = PROCESS_TIMEOUT_SECS) { StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR") StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT") outputGobbler.start() errorGobbler.start() - if (!p.waitFor(PROCESS_TIMEOUT_SECS, TimeUnit.SECONDS)) { + if (!p.waitFor(timeout_secs, TimeUnit.SECONDS)) { p.destroyForcibly() - throw new TimeoutException("Instrumented process failed to exit within $PROCESS_TIMEOUT_SECS") + throw new TimeoutException("Instrumented process failed to exit within $timeout_secs seconds") } return p.exitValue()