Skip to content

Update "tip" image in CI to JDK 27 #12855

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

Merged
gh-worker-dd-mergequeue-cf854d merged 3 commits into from
Oct 14, 2026
Merged

Update "tip" image in CI to JDK 27 #12855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fae8ec2
Test dd-trace-java-docker-build PR 182 images
sarahchen6 Oct 13, 2026
54afab0
Update tip to 27
sarahchen6 Oct 13, 2026
c79ac69
Revert back to ci- image
sarahchen6 Oct 14, 2026
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
13 changes: 6 additions & 7 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ variables:
MASS_READ_URL: "https://mass-read.us1.ddbuild.io"
MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
BUILDER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/dd-trace-java-docker-build" # images are pinned in images/mirror.lock.yaml in the DataDog/images repo
BUILDER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/dd-trace-java-docker-build" # images are pinned in images/mirror.lock.yaml in the ddoghq/images repo
BUILDER_IMAGE_VERSION_PREFIX: "ci-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "ci-" or "123_merge-")
TEST_COUNTS_S3_BUCKET: "dd-trace-java-ci-test-reports"
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ # the latest "tip" version is 26
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ # the latest "tip" version is 27
PROFILE_TESTS:
description: "Enable profiling of tests"
value: "false"
Expand Down Expand Up @@ -104,7 +104,6 @@ workflow:
- "17"
- "21"
- "25"
- "27" # JDK 27 TODO: remove after GA (tip will move to 27)
- "semeru11"
- "oracle8"
- "zulu8"
Expand Down Expand Up @@ -866,7 +865,7 @@ muzzle-dep-report:
- job: build
artifacts: false
variables:
DEFAULT_TEST_JVMS: /^(11|17|21|25|27|tip)$/ # Java 27 TODO: remove 27 after GA (tip will move to 27)
DEFAULT_TEST_JVMS: /^(11|17|21|25|tip)$/
TEST_JVM_ARGS: "-Xshare:off"
rules:
# Java 8 is excluded from the arm64 test matrix for all distributions.
Expand Down Expand Up @@ -1019,7 +1018,7 @@ test_inst_latest:
CACHE_TYPE: "latestdep"
parallel:
matrix:
- testJvm: ["8", "17", "21", "25", "27", "tip"] # Java 27 TODO: remove 27 after GA (tip will move to 27)
- testJvm: ["8", "17", "21", "25", "tip"]
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
# This emulates "parallel" by including it in the matrix
CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
Expand All @@ -1032,7 +1031,7 @@ test_inst_latest_arm64:
CACHE_TYPE: "latestdep"
parallel:
matrix:
- testJvm: ["17", "21", "25", "27", "tip"] # Java 27 TODO: remove 27 after GA (tip will move to 27)
- testJvm: ["17", "21", "25", "tip"]
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
# This emulates "parallel" by including it in the matrix
CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
Expand Down Expand Up @@ -1102,7 +1101,7 @@ test_debugger:
variables:
GRADLE_TARGET: ":debuggerTest"
CACHE_TYPE: "base"
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|27|tip|semeru8)$/ # Java 27 TODO: remove 27 after GA (tip will move to 27)
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip|semeru8)$/
parallel:
matrix: *test_matrix
# avoid running coverage for semeru8, semeru11, semeru17 and ibm8 as some tests are disabled and therefore cannot reach the
Expand Down
4 changes: 0 additions & 4 deletions .gitlab/upload_ciapp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ if [ -n "$TEST_JVM" ]; then
for var in $(compgen -v JAVA_ | grep -E '^JAVA_[0-9]+_HOME$'); do
ver="${var#JAVA_}"
ver="${ver%_HOME}"
# JDK 27 TODO: remove after GA (tip will move to 27)
if [ "$ver" = "27" ]; then
continue
fi
if [ "$ver" -gt "$MAX_VER" ] 2>/dev/null; then
MAX_VER="$ver"
fi
Expand Down
12 changes: 1 addition & 11 deletions buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@ import java.nio.file.Paths
class TestJvmSpec(val project: Project) {
companion object {
const val TEST_JVM = "testJvm"

// JDK 27 TODO: remove after GA (tip will move to 27)
internal fun resolveTipJavaVersion(javaVersions: List<Int>): String {
val tipJavaVersions = javaVersions.filterNot { it == 27 }
if (tipJavaVersions.isEmpty()) {
throw GradleException("No Java installations found for tip after excluding Java 27.")
}

return tipJavaVersions.max().toString()
}
}

/**
Expand All @@ -69,7 +59,7 @@ class TestJvmSpec(val project: Project) {
throw GradleException("No Java installations found via toolchains or JAVA_X_HOME environment variables.")
}

resolveTipJavaVersion(javaVersions) // JDK 27 TODO: revert back to "javaVersions.max().toString()" after GA
javaVersions.max().toString()
}

else -> testJvm
Expand Down
Loading