From 1e9f06c3d37d2500ef19defbcd0666e4c88f8337 Mon Sep 17 00:00:00 2001
From: Zachary Tong <zach@elastic.co>
Date: Tue, 8 Jan 2019 13:02:12 -0500
Subject: [PATCH] [TEST] Download artifacts directly, migrate off esvm

esvm is no longer maintained (or only sporadically), so move to the
direct artifacts.  Not a good long-term solution since we can't (easily)
get the most recent patch release in each branch, but is better than
being stuck at 6.3 with esvm.
---
 .travis.yml                   | 22 +++++++++-------------
 travis/download_and_run_es.sh |  8 ++++----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7de3a32ba..a445add6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,31 +18,27 @@ matrix:
   fast_finish: true
   include:
     - php: 7.0
-      env: ES_VERSION="6.5"
+      env: ES_VERSION="6.5.0"
 
     - php: 7.1
-      env: ES_VERSION="6.5"
+      env: ES_VERSION="6.5.0"
 
     - php: 7.2
-      env: ES_VERSION="6.5"
+      env: ES_VERSION="6.5.0"
 
     - php: 7.3
-      env: ES_VERSION="6.0"
+      env: ES_VERSION="6.0.0"
     - php: 7.3
-      env: ES_VERSION="6.1"
+      env: ES_VERSION="6.1.0"
     - php: 7.3
-      env: ES_VERSION="6.2"
+      env: ES_VERSION="6.2.0"
     - php: 7.3
-      env: ES_VERSION="6.3"
+      env: ES_VERSION="6.3.0"
     - php: 7.3
-      env: ES_VERSION="6.4"
+      env: ES_VERSION="6.4.0"
     - php: 7.3
-      env: ES_VERSION="6.5"
-    - php: 7.3
-      env: ES_VERSION="6.x"
+      env: ES_VERSION="6.5.0"
 
-  allow_failures:
-    - env: ES_VERSION="6.x"
 
 env:
   global:
diff --git a/travis/download_and_run_es.sh b/travis/download_and_run_es.sh
index cdc5c5394..f3b75716d 100755
--- a/travis/download_and_run_es.sh
+++ b/travis/download_and_run_es.sh
@@ -10,12 +10,12 @@ which java
 java -version
 
 
-echo "Downloading Elasticsearch v${ES_VERSION}-SNAPSHOT..."
+echo "Downloading Elasticsearch v${ES_VERSION}..."
 
-ES_URL=$(curl -sS "https://esvm-props.kibana.rocks/builds" | jq -r ".branches[\"$ES_VERSION\"].zip")
+ES_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz"
 
-curl -L -o elasticsearch-latest-SNAPSHOT.zip $ES_URL
-unzip "elasticsearch-latest-SNAPSHOT.zip"
+curl -L -o elasticsearch-latest.tar.gz $ES_URL
+tar -xvfz "elasticsearch-latest.tar.gz"
 
 echo "Adding repo to config..."
 find . -name "elasticsearch.yml" | while read TXT ; do echo 'repositories.url.allowed_urls: ["http://*"]' >> $TXT ; done