This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch test/opensearch in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit ac9f7697b6146b392540a91f873bc3b2cda59423 Author: kezhenxu94 <[email protected]> AuthorDate: Sat May 8 21:47:38 2021 +0800 test: try to use OpenSearch as a storage option --- .github/workflows/e2e.storages.yaml | 2 +- .../storage/docker-compose.opensearch1.0.yml | 47 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 0aec03a..9457e35 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -31,7 +31,7 @@ jobs: timeout-minutes: 90 strategy: matrix: - storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'influxdb', 'tidb', 'postgresql'] + storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'opensearch1.0', 'influxdb', 'tidb', 'postgresql'] env: SW_STORAGE: ${{ matrix.storage }} steps: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml new file mode 100644 index 0000000..b30f2d1 --- /dev/null +++ b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml @@ -0,0 +1,47 @@ +# 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. + +version: '2.1' + +services: + es: + image: kezhenxu94/opensearch:1.0.0-beta1 + expose: + - 9200 + networks: + - e2e + environment: + - discovery.type=single-node + - cluster.routing.allocation.disk.threshold_enabled=false + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"] + interval: 5s + timeout: 60s + retries: 120 + + oap: + extends: + file: ../base-compose.yml + service: oap-es7 + environment: + SW_STORAGE: elasticsearch7 + SW_PROMETHEUS_FETCHER: "default" + SW_TELEMETRY: prometheus + depends_on: + es: + condition: service_healthy + +networks: + e2e:
