X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Fupdate-java-alternatives.sh;h=f85e20187671ff27bfd8302308fe10fc11f81e5d;hb=refs%2Fchanges%2F18%2F14918%2F5;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..f85e2018 100644
--- a/shell/update-java-alternatives.sh
+++ b/shell/update-java-alternatives.sh
@@ -15,7 +15,13 @@
 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="/opt/jdk-11"
+    elif [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "10" ]]; then
+        export JAVA_HOME="/opt/jdk-10.0.2"
+    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,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