Skip to content

Commit d8917d1

Browse files
committed
[CI] Use docker to launch Elasticsearch in rake task (#803)
1 parent 270ff8c commit d8917d1

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

.travis.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@ matrix:
3333
jdk: oraclejdk8
3434
env: TEST_SUITE=unit
3535

36-
- rvm: 2.3.3
36+
- rvm: 2.5.1
3737
jdk: oraclejdk8
38-
env: TEST_SUITE=integration QUIET=y SERVER=start TEST_CLUSTER_LOGS=/tmp/log TEST_CLUSTER_COMMAND=/tmp/elasticsearch-6.3.0/bin/elasticsearch
38+
env: TEST_SUITE=integration QUIET=y
3939

4040
before_install:
41-
- gem update --system --no-rdoc --no-ri
41+
- gem update --system -q
42+
- gem update bundler -q
4243
- gem --version
43-
- gem install bundler -v 1.14.3 --no-rdoc --no-ri
4444
- bundle version
45-
- curl -sS https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.0.tar.gz | tar xz -C /tmp
4645

4746
install:
4847
- bundle install

Rakefile

+24-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,31 @@ namespace :test do
5959
end
6060
end
6161

62+
desc "Run Elasticsearch (Docker)"
63+
task :setup_elasticsearch do
64+
begin
65+
sh <<-COMMAND.gsub(/^\s*/, '').gsub(/\s{1,}/, ' ')
66+
docker stop $(docker ps -aq);
67+
docker rm $(docker ps -aq);
68+
docker rmi $(docker images -q);
69+
docker run -d=true \
70+
--env "discovery.type=single-node" \
71+
--env "cluster.name=elasticsearch-rails" \
72+
--env "http.port=9200" \
73+
--env "cluster.routing.allocation.disk.threshold_enabled=false" \
74+
--publish 9250:9200 \
75+
--rm \
76+
docker.elastic.co/elasticsearch/elasticsearch:6.3.0
77+
COMMAND
78+
require 'elasticsearch/extensions/test/cluster'
79+
Elasticsearch::Extensions::Test::Cluster::Cluster.new(version: '6.3.0',
80+
number_of_nodes: 1).wait_for_green
81+
rescue
82+
end
83+
end
84+
6285
desc "Run integration tests in all subprojects"
63-
task :integration do
86+
task :integration => :setup_elasticsearch do
6487
# 1/ elasticsearch-model
6588
#
6689
puts '-'*80

0 commit comments

Comments
 (0)