Skip to content

Commit 6da68e4

Browse files
fix: specify JAVA_HOME for GradleLauncherSmokeTest commands
1 parent 7704d77 commit 6da68e4

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package datadog.smoketest
22

33
import datadog.communication.util.IOUtils
44
import datadog.trace.civisibility.utils.ShellCommandExecutor
5+
import spock.util.environment.Jvm
56

67
/**
78
* This test runs Gradle Launcher with the Java Tracer injected
@@ -12,6 +13,7 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
1213
private static final int GRADLE_BUILD_TIMEOUT_MILLIS = 90_000
1314

1415
private static final String AGENT_JAR = System.getProperty("datadog.smoketest.agent.shadowJar.path")
16+
private static final String JAVA_HOME = buildJavaHome()
1517

1618
def "test Gradle Launcher injects tracer into Gradle Daemon: v#gradleVersion, cmd line - #gradleDaemonCmdLineParams"() {
1719
given:
@@ -45,18 +47,19 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
4547
}
4648

4749
private void givenGradleWrapper(String gradleVersion) {
48-
def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS)
50+
def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, ["JAVA_HOME": JAVA_HOME])
4951
shellCommandExecutor.executeCommand(IOUtils::readFully, "./gradlew", "wrapper", "--gradle-version", gradleVersion)
5052
}
5153

5254
private String whenRunningGradleLauncherWithJavaTracerInjected(String gradleDaemonCmdLineParams) {
5355
def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, [
54-
"GRADLE_OPTS" : "-javaagent:${AGENT_JAR}".toString(),
55-
"DD_CIVISIBILITY_ENABLED" : "true",
56-
"DD_CIVISIBILITY_AGENTLESS_ENABLED" : "true",
57-
"DD_CIVISIBILITY_AGENTLESS_URL" : "${mockBackend.intakeUrl}".toString(),
58-
"DD_CIVISIBILITY_GIT_UPLOAD_ENABLED" : "false",
59-
"DD_API_KEY" : "dummy"
56+
"JAVA_HOME" : JAVA_HOME,
57+
"GRADLE_OPTS" : "-javaagent:${AGENT_JAR}".toString(),
58+
"DD_CIVISIBILITY_ENABLED" : "true",
59+
"DD_CIVISIBILITY_AGENTLESS_ENABLED" : "true",
60+
"DD_CIVISIBILITY_AGENTLESS_URL" : "${mockBackend.intakeUrl}".toString(),
61+
"DD_CIVISIBILITY_GIT_UPLOAD_ENABLED": "false",
62+
"DD_API_KEY" : "dummy"
6063
])
6164
String[] command = ["./gradlew", "--no-daemon", "--info"]
6265
if (gradleDaemonCmdLineParams) {
@@ -74,4 +77,12 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
7477
}
7578
return true
7679
}
80+
81+
private static String buildJavaHome() {
82+
if (Jvm.current.isJava8()) {
83+
return System.getenv("JAVA_8_HOME")
84+
} else {
85+
return System.getenv("JAVA_" + Jvm.current.getJavaSpecificationVersion() + "_HOME")
86+
}
87+
}
7788
}

0 commit comments

Comments
 (0)