Skip to content

Commit b2eb8f7

Browse files
committed
fixes bug 1189394 - Update travis to use Elasticsearch 1.4, r=AdrianGaudebert
1 parent 0f209c2 commit b2eb8f7

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ services:
1616
before_install:
1717
- npm install -g less
1818
- gem install puppet puppet-lint
19-
- wget --no-check-certificate 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.10.tar.gz'
20-
- tar zxf elasticsearch-0.90.10.tar.gz
21-
# Note! bin/elasticsearch will start ES in the background automatically.
22-
# # That's why this works without using a service or a trailing &
23-
- ./elasticsearch-0.90.10/bin/elasticsearch
19+
- ./scripts/start-travis-elasticsearch.sh
2420

2521
install: true
2622

scripts/start-travis-elasticsearch.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
# Why download it and not use the elasticsearch service?
6+
# Two reasons
7+
# - predictable version (1.4.x) is what we use in production
8+
# - running it as a service would require sudo which we don't want to use
9+
wget --no-check-certificate 'https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.4.5.tar.gz'
10+
tar zxf elasticsearch-1.4.5.tar.gz
11+
echo "script.disable_dynamic: false" > elasticsearch.yml
12+
# the -d flag starts it as a daemon in the background
13+
./elasticsearch-1.4.5/bin/elasticsearch -d --config=elasticsearch.yml

0 commit comments

Comments
 (0)