Adjust JDK 25 EA build image

Author: sarahchen6

Dockerfile

@@ -50,9 +50,9 @@ COPY --from=eclipse-temurin:8-jdk-jammy /opt/java/openjdk /usr/lib/jvm/8
 COPY --from=eclipse-temurin:11-jdk-jammy /opt/java/openjdk /usr/lib/jvm/11
 COPY --from=eclipse-temurin:17-jdk-jammy /opt/java/openjdk /usr/lib/jvm/17
 COPY --from=eclipse-temurin:21-jdk-jammy /opt/java/openjdk /usr/lib/jvm/21
-# TODO: Update to eclipse-temurin once JDK 25 is generally available (ETA Sep 16).
-COPY --from=openjdk:25-jdk-bookworm /usr/local/openjdk-25 /usr/lib/jvm/25
 COPY --from=temurin-latest /opt/java/openjdk /usr/lib/jvm/${LATEST_VERSION}
+# TODO: Update to eclipse-temurin:25-jdk-noble once JDK 25 is generally available (ETA Sep 16).
+COPY --from=openjdk:25-jdk-bookworm /usr/local/openjdk-25 /usr/lib/jvm/25
 
 COPY --from=azul/zulu-openjdk:7 /usr/lib/jvm/zulu7 /usr/lib/jvm/7
 COPY --from=azul/zulu-openjdk:8 /usr/lib/jvm/zulu8 /usr/lib/jvm/zulu8
@@ -93,8 +93,8 @@ COPY --from=all-jdk /usr/lib/jvm/8 /usr/lib/jvm/8
 COPY --from=all-jdk /usr/lib/jvm/11 /usr/lib/jvm/11
 COPY --from=all-jdk /usr/lib/jvm/17 /usr/lib/jvm/17
 COPY --from=all-jdk /usr/lib/jvm/21 /usr/lib/jvm/21
-COPY --from=all-jdk /usr/lib/jvm/25 /usr/lib/jvm/25
 COPY --from=all-jdk /usr/lib/jvm/${LATEST_VERSION} /usr/lib/jvm/${LATEST_VERSION}
+COPY --from=all-jdk /usr/lib/jvm/25 /usr/lib/jvm/25
 
 # Base image with minimum requirements to build the project.
 # Based on the latest Ubuntu LTS image.
@@ -172,8 +172,8 @@ ENV JAVA_8_HOME=/usr/lib/jvm/8
 ENV JAVA_11_HOME=/usr/lib/jvm/11
 ENV JAVA_17_HOME=/usr/lib/jvm/17
 ENV JAVA_21_HOME=/usr/lib/jvm/21
-ENV JAVA_25_HOME=/usr/lib/jvm/25
 ENV JAVA_${LATEST_VERSION}_HOME=/usr/lib/jvm/${LATEST_VERSION}
+ENV JAVA_25_HOME=/usr/lib/jvm/25
 
 ENV JAVA_HOME=${JAVA_8_HOME}
 ENV PATH=${JAVA_HOME}/bin:${PATH}

build

@@ -3,7 +3,7 @@ set -eu
 
 readonly IMAGE_NAME="ghcr.io/datadog/dd-trace-java-docker-build"
 
-readonly BASE_VARIANTS=(8 11 17 21 25 stable) # add an ea variant once the early access build is available
+readonly BASE_VARIANTS=(8 11 17 21 stable 25) # 25 is currently an ea variant
 
 readonly VARIANTS=(
     7
@@ -158,8 +158,8 @@ function do_inner_test() {
     "$JAVA_11_HOME/bin/java" -version
     "$JAVA_17_HOME/bin/java" -version
     "$JAVA_21_HOME/bin/java" -version
-    "$JAVA_25_HOME/bin/java" -version
     "${!java_latest_home}/bin/java" -version
+    "$JAVA_25_HOME/bin/java" -version
     if [[ $variant != base && $variant != latest ]]; then
         if [[ $variant == "stable" ]]; then
             variant_lower="${LATEST_VERSION}"