File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -312,7 +312,7 @@ dd-octo-sts-pre-release-check:
312312 when : always
313313
314314# Builds java-profiler from JAVA_PROFILER_REF and publishes custom-ddprof/ddprof.jar for downstream Gradle jobs.
315- # Requires JDK 17 + for Gradle 9 and native toolchain for ddprof release (same base image as .gradle_build ).
315+ # Requires JDK 21 + for java-profiler native release and JDK 17+ to run Gradle 9 (wrapper defaults to JVM on PATH, often JDK 8 ).
316316build_java_profiler_ddprof :
317317 image : ${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}base
318318 stage : build
@@ -325,6 +325,30 @@ build_java_profiler_ddprof:
325325 KUBERNETES_CPU_REQUEST : 10
326326 KUBERNETES_MEMORY_REQUEST : 20Gi
327327 KUBERNETES_MEMORY_LIMIT : 20Gi
328+ before_script :
329+ - |
330+ # java-profiler uses Gradle 9.x; Gradle requires JVM 17+. Builder image default java is often JDK 8.
331+ if [ -n "${JAVA_21_HOME:-}" ] && [ -x "${JAVA_21_HOME}/bin/java" ]; then
332+ export JAVA_HOME="$JAVA_21_HOME"
333+ elif [ -n "${JAVA_17_HOME:-}" ] && [ -x "${JAVA_17_HOME}/bin/java" ]; then
334+ export JAVA_HOME="$JAVA_17_HOME"
335+ else
336+ shopt -s nullglob
337+ for d in /usr/lib/jvm/java-21-* /usr/lib/jvm/temurin-21-* /usr/lib/jvm/java-17-*; do
338+ if [ -x "${d}/bin/java" ]; then
339+ export JAVA_HOME="$d"
340+ break
341+ fi
342+ done
343+ shopt -u nullglob
344+ fi
345+ if [ -z "${JAVA_HOME:-}" ] || ! [ -x "${JAVA_HOME}/bin/java" ]; then
346+ echo "Could not find JDK 17+ for Gradle 9 (set JAVA_21_HOME or JAVA_17_HOME, or install JDK 21 under /usr/lib/jvm)." >&2
347+ ls -la /usr/lib/jvm 2>/dev/null || true
348+ exit 1
349+ fi
350+ export PATH="${JAVA_HOME}/bin:${PATH}"
351+ java -version
328352 script :
329353 - |
330354 set -euo pipefail
You can’t perform that action at this time.
0 commit comments