Skip to content

Test JDK 25 EA builder image #9087

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

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Test JDK 25 EA builder image #9087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebb5114
Test JDK 25 EA builder image
sarahchen6 Jul 2, 2025
3751eea
Try new PR 113
sarahchen6 Jul 9, 2025
15080ea
Add print statement to see java version being run
sarahchen6 Jul 9, 2025
f9daa18
Empty commit
sarahchen6 Jul 9, 2025
4755b8d
Exclude 25 from stable jvm calculation
sarahchen6 Jul 10, 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 .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variables:
GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties
MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
BUILDER_IMAGE_VERSION_PREFIX: "v25.06-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
BUILDER_IMAGE_VERSION_PREFIX: "113_merge-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/
PROFILE_TESTS:
Expand Down
1 change: 1 addition & 0 deletions ...a-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class RuntimeCallSiteTest extends AgentTestRunner {

def 'test exec with command string'() {
setup:
System.out.println(System.getProperty("java.version"))
final runtime = Mock(Runtime)
CommandInjectionModule iastModule = Mock(CommandInjectionModule)
final command = 'ls'
Expand Down
1 change: 1 addition & 0 deletions gradle/java_no_deps.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ project.afterEvaluate {
def javaVersions = System.getenv()
.findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ }
.collect { (it.key =~ /^JAVA_(\d+)_HOME$/)[0][1] as Integer }
.findAll { it != 25 } // Exclude LTS JDK v25 (early access)

if (javaVersions.isEmpty()) {
throw new GradleException("No valid JAVA_X_HOME environment variables found.")
Expand Down