[skywalking] branch master updated: Add ElasticSearch 7.14 to test and bump up OpenSearch version to 1.0 GA (#7415)

[wu...@apache.org]

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 b903bf1  Add ElasticSearch 7.14 to test and bump up OpenSearch version to 1.0 GA (#7415)
b903bf1 is described below

commit b903bf17a04e2ce5081fafee87f3171922391813
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Aug 6 10:36:45 2021 +0800

    Add ElasticSearch 7.14 to test and bump up OpenSearch version to 1.0 GA (#7415)
---
 .github/workflows/e2e.storages.yaml                                  | 2 +-
 .../{docker-compose.opensearch.yml => docker-compose.es7.14.yml}     | 5 +----
 test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml       | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml
index c50b604..1f1e892 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -36,7 +36,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'opensearch', 'influxdb', 'tidb', 'postgresql']
+        storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'es7.14', 'opensearch', 'influxdb', 'tidb', 'postgresql']
     env:
       SW_STORAGE: ${{ matrix.storage }}
     steps:
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml
similarity index 90%
copy from test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
copy to test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml
index 12a3cf2..14dc4ff 100644
--- a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
+++ b/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: opensearchproject/opensearch:1.0.0-beta1
+    image: elastic/elasticsearch:7.14.0
     expose:
       - 9200
     networks:
@@ -25,7 +25,6 @@ services:
     environment:
       - discovery.type=single-node
       - cluster.routing.allocation.disk.threshold_enabled=false
-      - opendistro_security.ssl.http.enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
@@ -40,8 +39,6 @@ services:
       SW_STORAGE: elasticsearch7
       SW_PROMETHEUS_FETCHER: "default"
       SW_TELEMETRY: prometheus
-      SW_ES_USER: admin
-      SW_ES_PASSWORD: admin
     depends_on:
       es:
         condition: service_healthy
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
index 12a3cf2..f7d7637 100644
--- a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
+++ b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
@@ -17,7 +17,7 @@ version: '2.1'
 
 services:
   es:
-    image: opensearchproject/opensearch:1.0.0-beta1
+    image: opensearchproject/opensearch:1.0.0
     expose:
       - 9200
     networks:
@@ -25,7 +25,7 @@ services:
     environment:
       - discovery.type=single-node
       - cluster.routing.allocation.disk.threshold_enabled=false
-      - opendistro_security.ssl.http.enabled=false
+      - plugins.security.ssl.http.enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s