X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fupdate-java-alternatives.sh;fp=shell%2Fupdate-java-alternatives.sh;h=0bed1ec2117111cddfdc2f06a4d410e90046873c;hb=6ac0bf5299e266b27215e61c80a92f9057197779;hp=39f46991a4bbd280cf34d352580b8d6187171062;hpb=70b380fccde98eaf35cc894795ff6736561ce6ce;p=releng%2Fglobal-jjb.git

diff --git a/shell/update-java-alternatives.sh b/shell/update-java-alternatives.sh
index 39f46991..0bed1ec2 100644
--- a/shell/update-java-alternatives.sh
+++ b/shell/update-java-alternatives.sh
@@ -15,13 +15,12 @@ echo "---> update-java-alternatives.sh"
 JAVA_ENV_FILE="/tmp/java.env"
 
 update-java-redhat() {
-    if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then
-        export JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
-    elif [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "12" ]]; then
-        export JAVA_HOME="/usr/lib/jvm/java-12-openjdk"
-    elif [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "17" ]]; then
-        export JAVA_HOME="/usr/lib/jvm/java-17-openjdk"
+    JAVA_RELEASE=${SET_JDK_VERSION//[a-zA-Z]/}
+    if [[ ${JAVA_RELEASE} -ge 9 ]]; then
+        # Java 9 or newer: new version format
+        export JAVA_HOME="/usr/lib/jvm/java-${JAVA_RELEASE}-openjdk"
     else
+        # Java 8 or older: old version format
         export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk"
     fi
     sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1