Skip to content

Commit 5d0fa98

Browse files
committed
Skip gradle related test failures
1 parent 4d56262 commit 5d0fa98

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {
9191

9292
private static boolean isSupported(ComparableVersion gradleVersion) {
9393
// https://docs.gradle.org/current/userguide/compatibility.html
94+
// TODO: Fix for Java 25. Add a new condition for Java 25 when it is supported by Gradle.
9495
if (Jvm.current.isJavaVersionCompatible(24)) {
9596
return gradleVersion.compareTo(new ComparableVersion("8.14")) >= 0
9697
} else if (Jvm.current.java21Compatible) {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ 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+
})
2629
class GradleDaemonSmokeTest extends AbstractGradleTest {
2730

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

dd-smoke-tests/log-injection/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ plugins {
44
id 'com.gradleup.shadow'
55
}
66

7+
ext {
8+
// TODO: Fix for Java 25. Gradle Test Executor failed. Update givenGradleVersionIsCompatibleWithCurrentJvm() when Gradle releases Java 25 support: https://docs.gradle.org/current/userguide/compatibility.html#java_runtime
9+
maxJavaVersionForTests = JavaVersion.VERSION_24
10+
}
11+
712
apply from: "$rootDir/gradle/java.gradle"
813
description = 'Log injection Smoke Tests.'
914

0 commit comments

Comments
 (0)