[TEST] (Hundredth time's a charm) more Java8 JRE tweaks

elastic · Apr 1, 2016 · 2cef10d · 2cef10d
1 parent ecb44ab
commit 2cef10d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,6 @@ language: php
 jdk:
   - oraclejdk8
 
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
-
 branches:
   except:
     - 0.4
@@ -29,6 +24,7 @@ env:
     - ES_TEST_HOST=http://localhost:9200
 
 before_install:
+  - java install oraclejdk8
   - ./travis/download_and_run_es.sh
 
 install:

diff --git a/travis/download_and_run_es.sh b/travis/download_and_run_es.sh
@@ -7,17 +7,8 @@ fi;
 
 killall java 2>/dev/null
 
-
-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
 
-
 echo "Downloading Elasticsearch v${ES_VERSION}-SNAPSHOT..."
 
 ES_URL=$(curl -sS "https://esvm-props.kibana.rocks/builds" | jq -r ".branches[\"$ES_VERSION\"].zip")