未验证 提交 a3bdbeb5 编写于 作者: K kezhenxu94 提交者: GitHub

Add OpenSearch 1.2.0 to test and verify it works (#8183)

上级 cef4f6dc
...@@ -38,12 +38,16 @@ jobs: ...@@ -38,12 +38,16 @@ jobs:
matrix: matrix:
config-file: config-file:
- storage/h2/e2e.yaml - storage/h2/e2e.yaml
- storage/opensearch/e2e.yaml
- storage/mysql/e2e.yaml - storage/mysql/e2e.yaml
- storage/tidb/e2e.yaml - storage/tidb/e2e.yaml
- storage/influxdb/e2e.yaml - storage/influxdb/e2e.yaml
- storage/postgres/e2e.yaml - storage/postgres/e2e.yaml
include: 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 - es-version: 6.3.2
config-file: storage/es/e2e.yaml config-file: storage/es/e2e.yaml
- es-version: 7.0.0 - es-version: 7.0.0
...@@ -65,6 +69,7 @@ jobs: ...@@ -65,6 +69,7 @@ jobs:
uses: ./.github/actions/infra-e2e-test uses: ./.github/actions/infra-e2e-test
env: env:
ES_VERSION: ${{ matrix.es-version }} ES_VERSION: ${{ matrix.es-version }}
OPENSEARCH_VERSION: ${{ matrix.opensearch-version }}
with: with:
config-file: ${{ matrix.config-file }} config-file: ${{ matrix.config-file }}
......
...@@ -56,6 +56,7 @@ Release Notes. ...@@ -56,6 +56,7 @@ Release Notes.
* Fix a null pointer bug when building `SampleFamily`. * Fix a null pointer bug when building `SampleFamily`.
* Fix the so11y latency of persistence execution latency not correct in ElasticSearch storage. * Fix the so11y latency of persistence execution latency not correct in ElasticSearch storage.
* Add `MeterReportService` `collectBatch` method. * Add `MeterReportService` `collectBatch` method.
* Add OpenSearch 1.2.0 to test and verify it works.
#### UI #### UI
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
version: '2.1' version: '2.1'
services: services:
es: opensearch:
image: opensearchproject/opensearch:1.1.0 image: opensearchproject/opensearch:${OPENSEARCH_VERSION}
expose: expose:
- 9200 - 9200
networks: networks:
...@@ -38,13 +38,13 @@ services: ...@@ -38,13 +38,13 @@ services:
service: oap service: oap
environment: environment:
SW_STORAGE: elasticsearch SW_STORAGE: elasticsearch
SW_STORAGE_ES_CLUSTER_NODES: es:9200 SW_STORAGE_ES_CLUSTER_NODES: opensearch:9200
SW_ES_USER: admin SW_ES_USER: admin
SW_ES_PASSWORD: admin SW_ES_PASSWORD: admin
ports: ports:
- 12800 - 12800
depends_on: depends_on:
es: opensearch:
condition: service_healthy condition: service_healthy
networks: networks:
- e2e - e2e
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册