From fa9f4c22e0153ee111eef93f179cbb77128b6406 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Tue, 18 Oct 2016 14:43:07 -0700 Subject: [PATCH] Updated Travis conf --- test/ci/before_install.sh | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/test/ci/before_install.sh b/test/ci/before_install.sh index 2af8e45..ba1d0fa 100755 --- a/test/ci/before_install.sh +++ b/test/ci/before_install.sh @@ -4,22 +4,14 @@ set -e gem install bundler -sudo apt-get purge elasticsearch +# from https://docs.travis-ci.com/user/database-setup/#ElasticSearch if [[ $ELASTICSEARCH_VERSION == 1* ]]; then - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb + curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb elif [[ $ELASTICSEARCH_VERSION == 2* ]]; then - wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.deb + curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.deb else - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb -fi -sudo dpkg -i elasticsearch-$ELASTICSEARCH_VERSION.deb -sudo service elasticsearch start - -if [ -n "$NOBRAINER" ]; then - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - - sudo apt-get update -q - sudo apt-get install rethinkdb - sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf - sudo service rethinkdb restart + curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb fi +sudo dpkg -i --force-confnew elasticsearch-$ELASTICSEARCH_VERSION.deb +sudo service elasticsearch restart +sleep 10 -- libgit2 0.21.0