[TEST] (And yet) more Java8 JRE tweaks

Author: polyfractal

travis/download_and_run_es.sh

@@ -7,25 +7,16 @@ fi;
 
 killall java 2>/dev/null
 
-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
+
+ORACLEJDK8_UJA_ALIAS="java-8-oracle"
+ORACLEJDK8_JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
+
 
 echo "Switching to Oracle JDK8 ($ORACLEJDK8_UJA_ALIAS), JAVA_HOME will be set to $ORACLEJDK8_JAVA_HOME"
 export JAVA_HOME="$ORACLEJDK8_JAVA_HOME"
 
 java -version
 
-/usr/lib/jvm/java-8-oracle/jre/bin/java -version
-
-jdk_switcher use oraclejdk8
-
-java -version
 
 echo "Downloading Elasticsearch v${ES_VERSION}-SNAPSHOT..."