Skip to content

Commit 0c35335

Browse files
committed
Test against Elastic stack 9
1 parent 62fe7a0 commit 0c35335

6 files changed

Lines changed: 32 additions & 0 deletions

File tree

.ci/.matrix_exclude.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ exclude:
3737
FRAMEWORK: celery-5-django-5
3838
- VERSION: python-3.9
3939
FRAMEWORK: celery-5-django-5
40+
# Elasticsearch
41+
- VERSION: python-3.6
42+
FRAMEWORK: elasticsearch-9
4043
# Flask
4144
- VERSION: pypy-3
4245
FRAMEWORK: flask-0.11 # see https://github.com/pallets/flask/commit/6e46d0cd, 0.11.2 was never released

.ci/.matrix_framework.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ FRAMEWORK:
3131
- pylibmc-newest
3232
- elasticsearch-7
3333
- elasticsearch-8
34+
- elasticsearch-9
3435
- cassandra-newest
3536
- psutil-newest
3637
#- eventlet-newest

.ci/.matrix_framework_full.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ FRAMEWORK:
6565
#- eventlet-newest
6666
- elasticsearch-7
6767
- elasticsearch-8
68+
- elasticsearch-9
6869
- gevent-newest
6970
- aiohttp-3.0
7071
- aiohttp-newest

tests/docker-compose.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,22 @@ services:
8686
volumes:
8787
- pyesdata8:/usr/share/elasticsearch/data
8888

89+
elasticsearch9:
90+
image: docker.elastic.co/elasticsearch/elasticsearch:9.2.0
91+
healthcheck:
92+
test: ["CMD", "curl", "-f", "http://localhost:9200"]
93+
ports:
94+
- "9200:9200"
95+
environment:
96+
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
97+
- "network.host=_site_"
98+
- "transport.host=127.0.0.1"
99+
- "http.host=0.0.0.0"
100+
- "xpack.security.enabled=false"
101+
- "action.destructive_requires_name=false" # allow for easy cleanup by calling DELETE *
102+
volumes:
103+
- pyesdata9:/usr/share/elasticsearch/data
104+
89105
mssql:
90106
image: mcr.microsoft.com/mssql/server
91107
environment:
@@ -144,6 +160,7 @@ services:
144160
run_tests:
145161
image: ${REGISTRY:-elasticobservability}/${IMAGE_NAME:-apm-agent-python-testing}:${PYTHON_VERSION}
146162
environment:
163+
ES_9_URL: 'http://elasticsearch9:9200'
147164
ES_8_URL: 'http://elasticsearch8:9200'
148165
ES_7_URL: 'http://elasticsearch7:9200'
149166

@@ -165,6 +182,8 @@ volumes:
165182
driver: local
166183
pyesdata8:
167184
driver: local
185+
pyesdata9:
186+
driver: local
168187
pycassandradata3:
169188
driver: local
170189
pymssqldata:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
elasticsearch>=9.0,<10.0
2+
aiohttp
3+
-r reqs-base.txt
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export PYTEST_MARKER="-m elasticsearch"
2+
export ES_URL="http://elasticsearch9:9200"
3+
export DOCKER_DEPS="elasticsearch9"
4+
export WAIT_FOR_HOST="elasticsearch9"
5+
export WAIT_FOR_PORT=9200

0 commit comments

Comments
 (0)