Commit fa9f4c22e0153ee111eef93f179cbb77128b6406
1 parent
c24c4bcf
Exists in
master
and in
21 other branches
Updated Travis conf
Showing
1 changed file
with
7 additions
and
15 deletions
Show diff stats
test/ci/before_install.sh
@@ -4,22 +4,14 @@ set -e | @@ -4,22 +4,14 @@ set -e | ||
4 | 4 | ||
5 | gem install bundler | 5 | gem install bundler |
6 | 6 | ||
7 | -sudo apt-get purge elasticsearch | 7 | +# from https://docs.travis-ci.com/user/database-setup/#ElasticSearch |
8 | if [[ $ELASTICSEARCH_VERSION == 1* ]]; then | 8 | if [[ $ELASTICSEARCH_VERSION == 1* ]]; then |
9 | - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb | 9 | + curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb |
10 | elif [[ $ELASTICSEARCH_VERSION == 2* ]]; then | 10 | elif [[ $ELASTICSEARCH_VERSION == 2* ]]; then |
11 | - wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.deb | 11 | + curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.deb |
12 | else | 12 | else |
13 | - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb | ||
14 | -fi | ||
15 | -sudo dpkg -i elasticsearch-$ELASTICSEARCH_VERSION.deb | ||
16 | -sudo service elasticsearch start | ||
17 | - | ||
18 | -if [ -n "$NOBRAINER" ]; then | ||
19 | - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list | ||
20 | - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - | ||
21 | - sudo apt-get update -q | ||
22 | - sudo apt-get install rethinkdb | ||
23 | - sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf | ||
24 | - sudo service rethinkdb restart | 13 | + curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb |
25 | fi | 14 | fi |
15 | +sudo dpkg -i --force-confnew elasticsearch-$ELASTICSEARCH_VERSION.deb | ||
16 | +sudo service elasticsearch restart | ||
17 | +sleep 10 |