Skip to content

Commit

Permalink
Add OpenSearch 1.2.0 to test and verify it works (#8183)
Browse files Browse the repository at this point in the history
  • Loading branch information
kezhenxu94 authored Nov 25, 2021
1 parent cef4f6d commit a3bdbeb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/e2e.storages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}

Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions test/e2e-v2/cases/storage/opensearch/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
version: '2.1'

services:
es:
image: opensearchproject/opensearch:1.1.0
opensearch:
image: opensearchproject/opensearch:${OPENSEARCH_VERSION}
expose:
- 9200
networks:
Expand All @@ -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
Expand Down

0 comments on commit a3bdbeb

Please sign in to comment.