Switch master/stable-3.11 to use java 21 Change-Id: I6ccb94faab810b48c9bad02432fc0b289c047ae9
diff --git a/jenkins-docker/agent-debian/set-java.sh b/jenkins-docker/agent-debian/set-java.sh index 8a9cc52..f50e7e3 100755 --- a/jenkins-docker/agent-debian/set-java.sh +++ b/jenkins-docker/agent-debian/set-java.sh
@@ -8,8 +8,8 @@ echo "Example: $0 17" echo " Java set to: /usr/lib/jvm/java-17-openjdk-amd64/bin/java" echo "Providing --branch automatically selects the java version" - echo "Example: $0 --branch stable-3.10" - echo " Java set to: /usr/lib/jvm/java-17-openjdk-amd64/bin/java" + echo "Example: $0 --branch stable-3.11" + echo " Java set to: /usr/lib/jvm/java-21-openjdk-amd64/bin/java" exit 1 fi @@ -17,7 +17,11 @@ then shift case "$1" in - master|stable-3.9|stable-3.10|stable-3.11) + master|stable-3.11) + JAVA_VERSION=21 + ;; + + stable-3.9|stable-3.10) JAVA_VERSION=17 ;; @@ -38,9 +42,10 @@ echo "Java set to: $(which java)" -if [ "$JAVA_VERSION" == "11" ] || [ "$JAVA_VERSION" == "17" ] +if [ "$JAVA_VERSION" == "11" ] || [ "$JAVA_VERSION" == "17" ] || \ + [ "$JAVA_VERSION" == "21" ] then - # See Bazel Issue 3236 with Java 11/17 [https://github.com/bazelbuild/bazel/issues/3236] - export BAZEL_OPTS="$BAZEL_OPTS --sandbox_tmpfs_path=/tmp" + # See Bazel Issue 3236 with Java 11/17/21 [https://github.com/bazelbuild/bazel/issues/3236] + export BAZEL_OPTS="$BAZEL_OPTS --sandbox_tmpfs_path=/tmp" fi