X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fupdate-java-alternatives.sh;h=8484a711bec75ddf6347dc9842839fc3159acc14;hb=refs%2Ftags%2Fv0.35.0;hp=a53cc0ad4a7c73611ce93075512b976c1d4632ab;hpb=f9e0c6aa3c19f8fc5c017f8a84e203d0d50d5b7f;p=releng%2Fglobal-jjb.git

diff --git a/shell/update-java-alternatives.sh b/shell/update-java-alternatives.sh
index a53cc0ad..8484a711 100644
--- a/shell/update-java-alternatives.sh
+++ b/shell/update-java-alternatives.sh
@@ -16,11 +16,9 @@ JAVA_ENV_FILE="/tmp/java.env"
 
 update-java-redhat() {
     if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then
-        export JAVA_HOME="/opt/jdk-11"
-    elif [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "10" ]]; then
-        export JAVA_HOME="/opt/jdk-10.0.2"
+        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"
+        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
@@ -32,7 +30,7 @@ update-java-redhat() {
 }
 
 update-java-ubuntu() {
-    export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION: -1}-openjdk-amd64"
+    export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64"
     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