Skip to content

Commit 8504f5a

Browse files
authored
Unskip GradleDaemonSmokeTest (#9308)
1 parent ec7ebc7 commit 8504f5a

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {
9393

9494
private static boolean isSupported(ComparableVersion gradleVersion) {
9595
// https://docs.gradle.org/current/userguide/compatibility.html
96-
// TODO: Fix for Java 25. Add a new condition for Java 25 when it is supported by Gradle.
97-
if (Jvm.current.isJavaVersionCompatible(24)) {
96+
if (Jvm.current.isJavaVersionCompatible(25)) {
97+
return gradleVersion.compareTo(new ComparableVersion("9.1")) >= 0
98+
} else if (Jvm.current.isJavaVersionCompatible(24)) {
9899
return gradleVersion.compareTo(new ComparableVersion("8.14")) >= 0
99100
} else if (Jvm.current.java21Compatible) {
100101
return gradleVersion.compareTo(new ComparableVersion("8.4")) >= 0

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ import spock.lang.TempDir
2323
import java.nio.file.Files
2424
import java.nio.file.Path
2525

26-
@IgnoreIf(reason = "TODO: Fix for Java 25. Gradle does not support Java 25 yet: https://docs.gradle.org/current/userguide/compatibility.html#java_runtime", value = {
27-
JavaVirtualMachine.isJavaVersionAtLeast(25)
28-
})
2926
class GradleDaemonSmokeTest extends AbstractGradleTest {
3027

3128
private static final String TEST_SERVICE_NAME = "test-gradle-service"

0 commit comments

Comments
 (0)