Skip to content

Commit 1afceba

Browse files
authored
update to ES 7 (elastic#911)
* update to ES 7 * more updates to make tests run * update the test matrix * remove python 3.3 * update xpack apis * relative imports
1 parent 3c2509d commit 1afceba

30 files changed

+3536
-1485
lines changed

.ci/test-matrix.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
11
---
22
ELASTICSEARCH_VERSION:
3-
- 6.4.2
4-
- 6.3.2
5-
- 6.1.4
6-
- 6.0.1
7-
3+
- 7.0.0-beta1
4+
- 6.6.2
85

96

107
PYTHON_VERSION:
11-
- 2.6
128
- 2.7
13-
- 3.3
149
- 3.4
1510
- 3.5
1611
- 3.6
1712
- 3.7
1813

1914
exclude:
20-
# since a base image for python2.6 doens't exist i need to create one.
21-
- PYTHON_VERSION: 2.6
22-
# Something is wrong with the way 3.7 and the es-client handle multiprocessing.
23-
# https://github.com/elastic/elasticsearch-py/issues/865
24-
- PYTHON_VERSION: 3.7
25-
# new feature in 6.4.2 which is causing a test failure.
26-
# https://github.com/elastic/elasticsearch-py/issues/866
27-
- ELASTICSEARCH_VERSION: 6.4.2
28-

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ services:
2828
- "repositories.url.allowed_urls=http://*"
2929
- node.attr.testattr=test
3030
- bootstrap.memory_lock=false
31+
- "node.name=test"
32+
- "cluster.initial_master_nodes=test"
3133
- "discovery.zen.ping.unicast.hosts=elasticsearch"
3234
- "http.max_content_length=5mb"
3335
networks:

0 commit comments

Comments
 (0)