[TEST] More Java8 JRE tweaks

elastic · Apr 1, 2016 · 9869977 · 9869977
1 parent 9dec069
commit 9869977
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/travis/download_and_run_es.sh b/travis/download_and_run_es.sh
@@ -7,11 +7,17 @@ fi;
 
 killall java 2>/dev/null
 
-ORACLEJDK8_UJA_ALIAS="java-8-oracle"
-ORACLEJDK8_JAVA_HOME="/usr/lib/jvm/java-8-oracle"
+if [[ -d "/usr/lib/jvm/java-8-oracle-$ARCH_SUFFIX" ]] ; then
+    # Currently unused, because the `travis_java` cookbook doesn't create this architecture specific symbolic link
+    ORACLEJDK8_UJA_ALIAS="java-8-oracle-$ARCH_SUFFIX"
+    ORACLEJDK8_JAVA_HOME="/usr/lib/jvm/java-8-oracle-$ARCH_SUFFIX"
+else
+    ORACLEJDK8_UJA_ALIAS="java-8-oracle"
+    ORACLEJDK8_JAVA_HOME="/usr/lib/jvm/java-8-oracle"
+fi
 
 echo "Switching to Oracle JDK8 ($ORACLEJDK8_UJA_ALIAS), JAVA_HOME will be set to $ORACLEJDK8_JAVA_HOME"
-$UJA --set "$ORACLEJDK8_UJA_ALIAS"
+update-java-alternatives --set "$ORACLEJDK8_UJA_ALIAS"
 export JAVA_HOME="$ORACLEJDK8_JAVA_HOME"
 
 java -version