From 6d402853c1bcd4da546eea774333ce423039ebb9 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 26 Jun 2025 14:32:30 +0200 Subject: [PATCH 1/2] increase maven smoke test timeout to 20 --- dd-smoke-tests/maven/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle index f52288a7381..b6c88764e1f 100644 --- a/dd-smoke-tests/maven/build.gradle +++ b/dd-smoke-tests/maven/build.gradle @@ -1,3 +1,5 @@ +import java.time.Duration + plugins { id "com.gradleup.shadow" } @@ -21,6 +23,10 @@ tasks.withType(Test).configureEach { dependsOn "shadowJar" jvmArgs "-Ddatadog.smoketest.maven.jar.path=${tasks.shadowJar.archiveFile.get()}" + // overriding the default timeout set in configure_tests.gradle, as Maven smoke + // tests might run for a longer duration + timeout = Duration.ofMinutes(20) + if (project.hasProperty("mavenRepositoryProxy")) { // propagate proxy URL to tests, to then propagate it to nested Gradle builds environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy") From f50fa512c4994c9b1da17be61356d0a1da77e91b Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 26 Jun 2025 15:08:45 +0200 Subject: [PATCH 2/2] use chronounit, mirroring gradle smoke test configuration --- dd-smoke-tests/maven/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle index b6c88764e1f..e984779c5b3 100644 --- a/dd-smoke-tests/maven/build.gradle +++ b/dd-smoke-tests/maven/build.gradle @@ -1,4 +1,5 @@ import java.time.Duration +import java.time.temporal.ChronoUnit plugins { id "com.gradleup.shadow" @@ -25,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.ofMinutes(20) + timeout = Duration.of(20, ChronoUnit.MINUTES) if (project.hasProperty("mavenRepositoryProxy")) { // propagate proxy URL to tests, to then propagate it to nested Gradle builds