[skywalking] branch chore/os-docker-official created (now b29b22e)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch chore/os-docker-official
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at b29b22e  Replace OpenSearch self-built docker image with official one

This branch includes the following new commits:

     new b29b22e  Replace OpenSearch self-built docker image with official one

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[skywalking] 01/01: Replace OpenSearch self-built docker image with official one

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch chore/os-docker-official
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit b29b22e6243acf7fadcccc1b73199c5a59265054
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri May 14 08:19:36 2021 +0800

    Replace OpenSearch self-built docker image with official one
---
 .github/workflows/e2e.storages.yaml                |  4 ----
 test/e2e/e2e-test/docker/build-opensearch.sh       | 27 ----------------------
 .../docker/storage/docker-compose.opensearch.yml   |  6 ++---
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml
index 13f6afd..c567c99 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -49,10 +49,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Build OpenSearch
-        if: env.SKIP_CI != 'true' && matrix.storage == 'opensearch'
-        run: bash test/e2e/e2e-test/docker/build-opensearch.sh
-
       - name: Run E2E Test
         if: env.SKIP_CI != 'true'
         uses: ./.github/actions/e2e-test
diff --git a/test/e2e/e2e-test/docker/build-opensearch.sh b/test/e2e/e2e-test/docker/build-opensearch.sh
deleted file mode 100644
index 6db86ce..0000000
--- a/test/e2e/e2e-test/docker/build-opensearch.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-set -ex
-
-wd=$(mktemp -d -t opensearch-XXXXXXXXXX) && cd "$wd"
-
-curl -L https://github.com/opensearch-project/OpenSearch/archive/1.0.0-beta1.tar.gz -o opensearch.tgz
-
-tar -zxf opensearch.tgz --strip-components=1 -C .
-
-./gradlew clean distribution:docker:assemble -x test -x javadoc
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 2724412..be49a99 100644
--- a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
+++ b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
@@ -16,8 +16,8 @@
 version: '2.1'
 
 services:
-  es:
-    image: opensearch:test
+  opensearch:
+    image: opensearchproject/opensearch:1.0.0-beta1
     expose:
       - 9200
     networks:
@@ -40,7 +40,7 @@ services:
       SW_PROMETHEUS_FETCHER: "default"
       SW_TELEMETRY: prometheus
     depends_on:
-      es:
+      opensearch:
         condition: service_healthy
 
 networks: