You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/11/25 14:18:14 UTC
[skywalking] branch master updated: Add OpenSearch 1.2.0 to test and verify it works (#8183)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new a3bdbeb Add OpenSearch 1.2.0 to test and verify it works (#8183)
a3bdbeb is described below
commit a3bdbeb57664dd3a6a5d80cb67eaea0d432c50e6
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Thu Nov 25 22:18:02 2021 +0800
Add OpenSearch 1.2.0 to test and verify it works (#8183)
---
.github/workflows/e2e.storages.yaml | 7 ++++++-
CHANGES.md | 1 +
test/e2e-v2/cases/storage/opensearch/docker-compose.yml | 8 ++++----
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml
index 793b858..d03a3a5 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 0883217..18ecd4a 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 88a34ab..461a4c4 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