Skip to content

Commit 2f2924d

Browse files
committed
[CI] Udpate version of Elasticsearch tested to 7.0.0
1 parent 1d08e29 commit 2f2924d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.ci/docker-compose/client.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
dockerfile: .ci/Dockerfile
88
args:
99
RUBY_TEST_VERSION: ${RUBY_TEST_VERSION:-2.6.1}
10-
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.0.0-rc2}
10+
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.0.0}
1111
TEST_SUITE: ${TEST_SUITE:-client}
1212
environment:
1313
- "TEST_ES_SERVER=http://elasticsearch:9200"
@@ -18,7 +18,7 @@ services:
1818
depends_on:
1919
- elasticsearch
2020
elasticsearch:
21-
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-rc2}
21+
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0}
2222
environment:
2323
- cluster.name=docker-cluster
2424
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

.ci/docker-compose/rest_api.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
dockerfile: .ci/Dockerfile
88
args:
99
RUBY_TEST_VERSION: ${RUBY_TEST_VERSION:-2.6.1}
10-
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.0.0-rc2}
10+
ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.0.0}
1111
TEST_SUITE: ${TEST_SUITE:-client}
1212
environment:
1313
- "TEST_ES_SERVER=http://elasticsearch:9200"
@@ -18,7 +18,7 @@ services:
1818
depends_on:
1919
- elasticsearch
2020
elasticsearch:
21-
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0-rc2}
21+
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-7.0.0}
2222
environment:
2323
- cluster.name=docker-cluster
2424
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

.ci/run-tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
set -eo pipefail
1313

1414
export RUBY_TEST_VERSION=${RUBY_TEST_VERSION:-2.6.1}
15-
export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-7.0.0-rc2}
15+
export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-7.0.0}
1616
export SINGLE_TEST=${SINGLE_TEST}
1717

1818
set +x

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
ELASTICSEARCH_VERSION:
3-
- 7.0.0-rc2
3+
- 7.0.0
44

55
RUBY_TEST_VERSION:
66
- 2.6.1

0 commit comments

Comments
 (0)