X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fupdate-java-alternatives.sh;h=69bf0195fc3aa02bcfcc1f856380ba175447a4fa;hb=ff69c5d06f4d27f3784bd56c6006e380c95f797f;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..69bf0195 100644
--- a/shell/update-java-alternatives.sh
+++ b/shell/update-java-alternatives.sh
@@ -15,7 +15,11 @@
 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"
+    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 +30,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