Skip to content

Commit c2aec92

Browse files
authored
Update docker base image (#9550)
* Test new base image * Upgrade build prefix version * Disable kotlin compilation debugger tests for JDK 25
1 parent ce2679f commit c2aec92

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties
2929
MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
3030
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
31-
BUILDER_IMAGE_VERSION_PREFIX: "v25.07-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
31+
BUILDER_IMAGE_VERSION_PREFIX: "v25.09-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3232
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
3333
DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25
3434
PROFILE_TESTS:

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
621621
}
622622

623623
@Test
624+
@EnabledForJreRange(max = JRE.JAVA_24)
624625
@DisabledIf(
625626
value = "datadog.environment.JavaVirtualMachine#isJ9",
626627
disabledReason = "Issue with J9 when compiling Kotlin code")
@@ -651,6 +652,7 @@ public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
651652
}
652653

653654
@Test
655+
@EnabledForJreRange(max = JRE.JAVA_24)
654656
@DisabledIf(
655657
value = "datadog.environment.JavaVirtualMachine#isJ9",
656658
disabledReason = "Issue with J9 when compiling Kotlin code")
@@ -678,6 +680,7 @@ public void suspendKotlin() throws IOException, URISyntaxException {
678680
}
679681

680682
@Test
683+
@EnabledForJreRange(max = JRE.JAVA_24)
681684
@DisabledIf(
682685
value = "datadog.environment.JavaVirtualMachine#isJ9",
683686
disabledReason = "Issue with J9 when compiling Kotlin code")
@@ -711,6 +714,7 @@ public void suspendMethodKotlin() {
711714
}
712715

713716
@Test
717+
@EnabledForJreRange(max = JRE.JAVA_24)
714718
@DisabledIf(
715719
value = "datadog.environment.JavaVirtualMachine#isJ9",
716720
disabledReason = "Issue with J9 when compiling Kotlin code")

0 commit comments

Comments
 (0)