Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ci/.matrix_framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ FRAMEWORK:
- pyodbc-newest
- memcached-newest
- pylibmc-newest
- elasticsearch-2
- elasticsearch-7
- elasticsearch-8
- cassandra-newest
Expand Down
3 changes: 0 additions & 3 deletions .ci/.matrix_framework_full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ FRAMEWORK:
- psutil-5.0
- psutil-4.0
#- eventlet-newest
- elasticsearch-2
- elasticsearch-5
- elasticsearch-6
- elasticsearch-7
- elasticsearch-8
- gevent-newest
Expand Down
42 changes: 0 additions & 42 deletions tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,6 @@ services:
redis:
image: redis

elasticsearch6:
image: docker.elastic.co/elasticsearch/elasticsearch:6.8.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "network.host="
- "transport.host=127.0.0.1"
- "http.host=0.0.0.0"
- "xpack.security.enabled=false"
volumes:
- pyesdata6:/usr/share/elasticsearch/data

elasticsearch7:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0
healthcheck:
Expand Down Expand Up @@ -101,32 +88,6 @@ services:
volumes:
- pyesdata8:/usr/share/elasticsearch/data

elasticsearch5:
image: docker.elastic.co/elasticsearch/elasticsearch:5.6.16
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "network.host="
- "transport.host=127.0.0.1"
- "http.host=0.0.0.0"
- "xpack.security.enabled=false"
volumes:
- pyesdata5:/usr/share/elasticsearch/data

elasticsearch2:
image: elasticsearch:2
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "network.host="
- "transport.host=127.0.0.1"
- "http.host=0.0.0.0"
- "xpack.security.enabled=false"
volumes:
- pyesdata2:/usr/share/elasticsearch/data

mssql:
image: mcr.microsoft.com/mssql/server
environment:
Expand Down Expand Up @@ -187,9 +148,6 @@ services:
environment:
ES_8_URL: 'http://elasticsearch8:9200'
ES_7_URL: 'http://elasticsearch7:9200'
ES_6_URL: 'http://elasticsearch6:9200'
ES_5_URL: 'http://elasticsearch5:9200'
ES_2_URL: 'http://elasticsearch2:9200'


volumes:
Expand Down
2 changes: 0 additions & 2 deletions tests/requirements/reqs-elasticsearch-2.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tests/requirements/reqs-elasticsearch-5.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tests/requirements/reqs-elasticsearch-6.txt

This file was deleted.

5 changes: 0 additions & 5 deletions tests/scripts/envs/elasticsearch-2.sh

This file was deleted.

5 changes: 0 additions & 5 deletions tests/scripts/envs/elasticsearch-5.sh

This file was deleted.

5 changes: 0 additions & 5 deletions tests/scripts/envs/elasticsearch-6.sh

This file was deleted.

Loading