From fae8ec201e46b3204f38c53a6eb6ebb7f9da267c Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 13 Oct 2026 14:13:53 -0400 Subject: [PATCH 1/3] Test dd-trace-java-docker-build PR 182 images --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba77c823f7a..7408ccc4b7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ variables: 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_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-") + BUILDER_IMAGE_VERSION_PREFIX: "182_merge-" # 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 From 54afab00c618002bbd9c6d7e86330153af31d6c3 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 13 Oct 2026 15:43:53 -0400 Subject: [PATCH 2/3] Update tip to 27 --- .gitlab-ci.yml | 13 ++++++------- .gitlab/upload_ciapp.sh | 4 ---- .../gradle/plugin/testJvmConstraints/TestJvmSpec.kt | 12 +----------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7408ccc4b7e..0b805a0b07e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: "182_merge-" # 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" @@ -104,7 +104,6 @@ workflow: - "17" - "21" - "25" - - "27" # JDK 27 TODO: remove after GA (tip will move to 27) - "semeru11" - "oracle8" - "zulu8" @@ -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. @@ -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"] @@ -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"] @@ -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 diff --git a/.gitlab/upload_ciapp.sh b/.gitlab/upload_ciapp.sh index a38ca3323eb..7204d149d6f 100755 --- a/.gitlab/upload_ciapp.sh +++ b/.gitlab/upload_ciapp.sh @@ -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 diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt index d93480c09e0..1e5315bab5b 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt @@ -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): 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() - } } /** @@ -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 From c79ac69d4479ab214f5c80e985e15ea851f2bacb Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 13 Oct 2026 20:56:39 -0400 Subject: [PATCH 3/3] Revert back to ci- image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b805a0b07e..9e419e2086f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ variables: 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 ddoghq/images repo - BUILDER_IMAGE_VERSION_PREFIX: "182_merge-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "ci-" or "123_merge-") + 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 27