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 15e1122 Replace OpenSearch self-built docker image with official one
(#6938)
15e1122 is described below
commit 15e112262cec6cdaf70aa1e4a31252e611c6038d
Author: Zhenxu Ke <[email protected]>
AuthorDate: Fri May 14 19:24:23 2021 +0800
Replace OpenSearch self-built docker image with official one (#6938)
---
.github/workflows/e2e.storages.yaml | 4 ----
test/e2e/e2e-test/docker/build-opensearch.sh | 27 ----------------------
.../docker/storage/docker-compose.opensearch.yml | 5 +++-
3 files changed, 4 insertions(+), 32 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..12a3cf2 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: opensearch:test
+ image: opensearchproject/opensearch:1.0.0-beta1
expose:
- 9200
networks:
@@ -25,6 +25,7 @@ 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
@@ -39,6 +40,8 @@ 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
