diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 793b858a12ee50f23af3b817eedc5dd09a41107f..d03a3a532efba01c48fe90f1412fa9f177b1e3e1 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -38,12 +38,16 @@ jobs: matrix: config-file: - storage/h2/e2e.yaml - - storage/opensearch/e2e.yaml - storage/mysql/e2e.yaml - storage/tidb/e2e.yaml - storage/influxdb/e2e.yaml - storage/postgres/e2e.yaml include: + - opensearch-version: 1.1.0 + config-file: storage/opensearch/e2e.yaml + - opensearch-version: 1.2.0 + config-file: storage/opensearch/e2e.yaml + - es-version: 6.3.2 config-file: storage/es/e2e.yaml - es-version: 7.0.0 @@ -65,6 +69,7 @@ jobs: uses: ./.github/actions/infra-e2e-test env: ES_VERSION: ${{ matrix.es-version }} + OPENSEARCH_VERSION: ${{ matrix.opensearch-version }} with: config-file: ${{ matrix.config-file }} diff --git a/CHANGES.md b/CHANGES.md index 0883217011f9898d93e3d6f93f0d10a9b65edede..18ecd4a08679c88752ae8d25aa090f7954a3bfed 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -56,6 +56,7 @@ Release Notes. * Fix a null pointer bug when building `SampleFamily`. * Fix the so11y latency of persistence execution latency not correct in ElasticSearch storage. * Add `MeterReportService` `collectBatch` method. +* Add OpenSearch 1.2.0 to test and verify it works. #### UI diff --git a/test/e2e-v2/cases/storage/opensearch/docker-compose.yml b/test/e2e-v2/cases/storage/opensearch/docker-compose.yml index 88a34abe517e4790415a790f15ca0c782e534d2d..461a4c4d2174265adabe691cbdc01c177cd231d1 100644 --- a/test/e2e-v2/cases/storage/opensearch/docker-compose.yml +++ b/test/e2e-v2/cases/storage/opensearch/docker-compose.yml @@ -16,8 +16,8 @@ version: '2.1' services: - es: - image: opensearchproject/opensearch:1.1.0 + opensearch: + image: opensearchproject/opensearch:${OPENSEARCH_VERSION} expose: - 9200 networks: @@ -38,13 +38,13 @@ services: service: oap environment: SW_STORAGE: elasticsearch - SW_STORAGE_ES_CLUSTER_NODES: es:9200 + SW_STORAGE_ES_CLUSTER_NODES: opensearch:9200 SW_ES_USER: admin SW_ES_PASSWORD: admin ports: - 12800 depends_on: - es: + opensearch: condition: service_healthy networks: - e2e