From c38e5fe13eafcca01d7fe31c3fc916631435af6f Mon Sep 17 00:00:00 2001
From: Zachary Tong <zacharyjtong@gmail.com>
Date: Fri, 1 Apr 2016 15:54:39 -0400
Subject: [PATCH] [TEST] (Hundred and one time's a charm) more Java8 JRE tweaks

---
 .travis.yml                   | 7 ++++++-
 travis/download_and_run_es.sh | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0ab947696..ade99e014 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,11 @@ language: php
 jdk:
   - oraclejdk8
 
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
+
 branches:
   except:
     - 0.4
@@ -22,9 +27,9 @@ env:
     - ES_VERSION="master"
     - TEST_BUILD_REF="origin/master"
     - ES_TEST_HOST=http://localhost:9200
+    - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
 
 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
index e39a85eeb..ff8dbf426 100755
--- a/travis/download_and_run_es.sh
+++ b/travis/download_and_run_es.sh
@@ -7,8 +7,11 @@ fi;
 
 killall java 2>/dev/null
 
+
+which java
 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")