fix(CI): update Travis-CI

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
-# Once openjdk/oraclejdk dependencies are resolved, change to dist: xenial
-dist: trusty
+dist: bionic
 notifications:
   email: false
 node_js:
@@ -11,23 +10,21 @@ matrix:
   fast_finish: true
 env:
   matrix:
-    - ES_VERSION=5.6.12
+    - ES_VERSION=5.6.12 JDK_VERSION=oraclejdk8
+    - ES_VERSION=5.6.12 JDK_VERSION=oraclejdk11
+    - ES_VERSION=6.8.4 JDK_VERSION=oraclejdk8
+    - ES_VERSION=6.8.4 JDK_VERSION=oraclejdk11
 jdk:
   - oraclejdk8
+  - oraclejdk11
 install:
-  - mkdir /tmp/elasticsearch
   - ./scripts/setup_ci.sh
   - npm i
 script:
   - npm run travis
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
 before_install:
   - npm i -g npm
 before_script:
-  - sleep 10
   - curl http://127.0.0.1:9200/
   - ./bin/create_index
 branches:

scripts/elastic_wait.sh

@@ -0,0 +1,23 @@
+function elastic_status(){
+  curl --output /dev/null --silent --write-out "%{http_code}" "http://${ELASTIC_HOST:-localhost:9200}" || true;
+}
+
+function elastic_wait(){
+  echo 'waiting for elasticsearch service to come up';
+  retry_count=30
+
+  i=1
+  while [[ "$i" -le "$retry_count" ]]; do
+    if [[ $(elastic_status) -eq 200 ]]; then
+      echo "Elasticsearch up!"
+      exit 0
+    fi
+    sleep 2
+    printf "."
+    i=$(($i + 1))
+  done
+
+  echo
+  echo "Elasticsearch did not come up, check configuration"
+  exit 1
+}

scripts/setup_ci.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 set -e
 
+# create elasticsearch directory
+mkdir /tmp/elasticsearch
+
+# allow switching the JDK version
+curl -s https://raw.githubusercontent.com/michaelklishin/jdk_switcher/master/jdk_switcher.sh | bash -s use "${JDK_VERSION}"
+
 # download and install elasticsearch with ICU plugin
 # note: the download servers and plugin install binary changed between versions
 
@@ -25,9 +31,14 @@ else
   /tmp/elasticsearch/bin/elasticsearch-plugin install analysis-icu
 
   # start elasticsearch server
-  /tmp/elasticsearch/bin/elasticsearch --daemonize -Epath.data=/tmp -Edefault.path.data=/tmp -Ediscovery.type=single-node
+  /tmp/elasticsearch/bin/elasticsearch --daemonize -Epath.data=/tmp/elasticsearch -Ediscovery.type=single-node
 fi
 
+# wait for server to boot up
+# logs show that on travis-ci it can take ~17s to boot an ES6 server
+source "${BASH_SOURCE%/*}/elastic_wait.sh"
+elastic_wait
+
 # set the correct esclient.apiVersion in pelias.json
 v=( ${ES_VERSION//./ } ) # split version number on '.'
 echo "{\"esclient\":{\"apiVersion\":\"${v[0]}.${v[1]}\"}}" > ~/pelias.json