Skip to content

Commit 858186d

Browse files
committed
update travis test matrix
1 parent 7ede858 commit 858186d

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ env:
66
- INTEGRATION=false
77
- INTEGRATION=true ES_VERSION=1.7.6 TEST_DEBUG=true
88
- INTEGRATION=true ES_VERSION=2.4.4 TEST_DEBUG=true
9-
- INTEGRATION=true ES_VERSION=5.5.0 TEST_DEBUG=true
10-
- INTEGRATION=true ES_VERSION=5.6.0 TEST_DEBUG=true
9+
- INTEGRATION=true ES_VERSION=5.6.3 TEST_DEBUG=true
1110
- INTEGRATION=true ES_VERSION=master TEST_DEBUG=true
12-
- SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=5.5.0 TEST_DEBUG=true
13-
- INTEGRATION=true ES_VERSION=6.0.0-beta2 TEST_DEBUG=true
14-
- SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=6.0.0-beta2 TEST_DEBUG=true
11+
- SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=5.6.3 TEST_DEBUG=true
12+
- INTEGRATION=true ES_VERSION=6.0.0 TEST_DEBUG=true
13+
- SECURE_INTEGRATION=true INTEGRATION=true ES_VERSION=6.0.0 TEST_DEBUG=true
1514
rvm:
1615
- jruby-1.7.25
1716
matrix:

ci/run.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,11 @@ else
129129
start_es
130130
bundle exec rspec -fd $extra_tag_args --tag update_tests:painless --tag update_tests:groovy --tag es_version:$es_distribution_version $spec_path
131131
;;
132-
5.6.*)
133-
setup_es https://snapshots.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-SNAPSHOT.tar.gz
134-
es_distribution_version=$(get_es_distribution_version)
135-
start_es -Escript.inline=true -Escript.stored=true -Escript.file=true
136-
bundle exec rspec -fd $extra_tag_args --tag update_tests:painless --tag update_tests:groovy --tag es_version:$es_distribution_version $spec_path
137-
;;
138132
5.*)
139133
setup_es https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
140134
es_distribution_version=$(get_es_distribution_version)
141135
start_es -Escript.inline=true -Escript.stored=true -Escript.file=true
142-
bundle exec rspec -fd $extra_tag_args --tag update_tests:painless --tag es_version:$es_distribution_version --tag update_tests:groovy $spec_path
136+
bundle exec rspec -fd $extra_tag_args --tag update_tests:painless --tag update_tests:groovy --tag es_version:$es_distribution_version $spec_path
143137
;;
144138
2.*)
145139
setup_es https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-$ES_VERSION.tar.gz

0 commit comments

Comments
 (0)