Skip to content

Increase CiVis smoke tests timeout#9062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daniel-mohedano merged 10 commits into from
Jul 9, 2025
Merged

Increase CiVis smoke tests timeout #9062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1277a43
increase maven smoke tests' timeout to 180
daniel-mohedano Jun 30, 2025
200ccc1
noop change to trigger ci
daniel-mohedano Jun 30, 2025
e101270
increase maven timeout to 240s and gradlesmoke suite timeout to 20m
daniel-mohedano Jun 30, 2025
e3af0a8
increase timeout only for dependencies download
daniel-mohedano Jul 1, 2025
abb4997
move dependency downloads to build task
daniel-mohedano Jul 1, 2025
dcc6e79
Revert "move dependency downloads to build task"
daniel-mohedano Jul 2, 2025
d29a87f
increase dependencies timeout to 400
daniel-mohedano Jul 2, 2025
862885a
Merge branch 'master' into daniel.mohedano/maven-smoke-warmup-timeout
daniel-mohedano Jul 2, 2025
5dfd72a
Merge branch 'master' into daniel.mohedano/maven-smoke-warmup-timeout
daniel-mohedano Jul 2, 2025
99a5b11
increase maven smoke test gradle task timeout
daniel-mohedano Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dd-smoke-tests/gradle/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
}

2 changes: 1 addition & 1 deletion dd-smoke-tests/maven/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
9 changes: 5 additions & 4 deletions dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -293,7 +294,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
private void retryUntilSuccessfulOrNoAttemptsLeft(List<String> mvnCommand, Map<String, String> 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
}
Expand All@@ -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()
Expand Down
Loading