X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fupdate-java-alternatives.sh;h=536063b9d6643b80dc2362b76e7dc197aa7b6cb7;hb=19cb59a5d60873873f6905b97266a8e919796dbc;hp=29f6d38d314ee6d6b033e6373a6ab7e074b62fc4;hpb=61fe47417032bde7833830f6c5a3ebb2a4c8fe45;p=releng%2Fglobal-jjb.git

diff --git a/shell/update-java-alternatives.sh b/shell/update-java-alternatives.sh
index 29f6d38d..536063b9 100644
--- a/shell/update-java-alternatives.sh
+++ b/shell/update-java-alternatives.sh
@@ -8,14 +8,20 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-
+echo "---> update-java-alternatives.sh"
 # This script takes the java-version variable to set the proper alternative
 # for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros
 
 JAVA_ENV_FILE="/tmp/java.env"
 
 update-java-redhat() {
-    export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION: -1}.0-openjdk"
+    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"
+    else
+        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
     sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1
     sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1
@@ -26,7 +32,8 @@ update-java-redhat() {
 }
 
 update-java-ubuntu() {
-    export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION: -1}-openjdk-amd64"
+    HOST_ARCH=$(dpkg --print-architecture)
+    export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-${HOST_ARCH}"
     sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1
     sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1
     sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1