Skip to content

Commit 226be85

Browse files
authored
Remove es7, update es8 in cicd (stac-utils#497)
**Related Issue(s):** - None **Description:** - Remove elasticsearch 7 from cicd testing - Update to elastcisearch 8.19.5 in cicd - Update compose.yml to 8.19.5 **PR Checklist:** - [x] Code is formatted and linted (run `pre-commit run --all-files`) - [x] Tests pass (run `make test`) - [x] Documentation has been updated to reflect changes, if applicable - [x] Changes are added to the changelog
1 parent 86e65d0 commit 226be85

File tree

3 files changed

+14
-23
lines changed

3 files changed

+14
-23
lines changed

.github/workflows/cicd.yml

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
services:
1818
elasticsearch_8_svc:
19-
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
19+
image: docker.elastic.co/elasticsearch/elasticsearch:8.19.5
2020
env:
2121
cluster.name: stac-cluster
2222
node.name: es01
@@ -32,23 +32,6 @@ jobs:
3232
ports:
3333
- 9200:9200
3434

35-
elasticsearch_7_svc:
36-
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
37-
env:
38-
cluster.name: stac-cluster
39-
node.name: es01
40-
network.host: 0.0.0.0
41-
transport.host: 0.0.0.0
42-
discovery.type: single-node
43-
http.port: 9400
44-
xpack.license.self_generated.type: basic
45-
xpack.security.enabled: false
46-
xpack.security.transport.ssl.enabled: false
47-
ES_JAVA_OPTS: -Xms512m -Xmx1g
48-
action.destructive_requires_name: false
49-
ports:
50-
- 9400:9400
51-
5235
opensearch_2_11:
5336
image: opensearchproject/opensearch:2.11.1
5437
env:
@@ -69,7 +52,7 @@ jobs:
6952
strategy:
7053
matrix:
7154
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13"]
72-
backend: [ "elasticsearch7", "elasticsearch8", "opensearch"]
55+
backend: [ "elasticsearch8", "opensearch"]
7356

7457
name: Python ${{ matrix.python-version }} testing with ${{ matrix.backend }}
7558

@@ -120,9 +103,9 @@ jobs:
120103
pipenv run pytest -svvv --timeout=300
121104
env:
122105
ENVIRONMENT: testing
123-
ES_PORT: ${{ matrix.backend == 'elasticsearch7' && '9400' || matrix.backend == 'elasticsearch8' && '9200' || '9202' }}
106+
ES_PORT: ${{ matrix.backend == 'elasticsearch8' && '9200' || '9202' }}
124107
ES_HOST: 172.17.0.1
125108
ES_USE_SSL: false
126109
DATABASE_REFRESH: true
127110
ES_VERIFY_CERTS: false
128-
BACKEND: ${{ matrix.backend == 'elasticsearch7' && 'elasticsearch' || matrix.backend == 'elasticsearch8' && 'elasticsearch' || 'opensearch' }}
111+
BACKEND: ${{ matrix.backend == 'elasticsearch8' && 'elasticsearch' || 'opensearch' }}

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
99

1010
### Added
1111

12-
- Spatial search support for collections via `bbox` parameter on `/collections` endpoint. Collections are now indexed with a `bbox_shape` field (GeoJSON polygon) derived from their spatial extent for efficient geospatial queries when created or updated. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481)
12+
- Spatial search support for collections via `bbox` parameter on `/collections` endpoint. Collections are now indexed with a `bbox_shape` field (GeoJSON polygon) derived from their spatial extent for efficient geospatial queries when created or updated. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481
1313
- Introduced SFEOS Tools (`sfeos_tools/`) - An installable Click-based CLI package for managing SFEOS deployments. Initial command `add-bbox-shape` adds the `bbox_shape` field to existing collections for spatial search compatibility. Install with `pip install sfeos-tools[elasticsearch]` or `pip install sfeos-tools[opensearch]`. [#481](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/481)
1414
- Moved SFEOS Tools to its own repository at [Healy-Hyperspatial/sfeos-tools](https://github.com/Healy-Hyperspatial/sfeos-tools). The CLI package is now maintained separately. [#PR_NUMBER]
1515
- CloudFerro logo to sponsors and supporters list [#485](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/485)
@@ -22,6 +22,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2222

2323
### Fixed
2424

25+
### Removed
26+
27+
- Removed Elasticsearch 7 from CI/CD test matrix. The project now only tests against Elasticsearch 8 and OpenSearch. [#497](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/497)
28+
29+
### Updated
30+
31+
- Updated Elasticsearch version to 8.19.5 in CI/CD test matrix and compose.yml. [#497](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/497)
32+
2533
## [v6.5.1] - 2025-09-30
2634

2735
### Fixed

compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ services:
7171

7272
elasticsearch:
7373
container_name: es-container
74-
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.11.0}
74+
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-8.19.5}
7575
hostname: elasticsearch
7676
environment:
7777
ES_JAVA_OPTS: -Xms512m -Xmx1g

0 commit comments

Comments
 (0)