diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index c50b6041f..1f1e89269 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.es7.14.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml new file mode 100644 index 000000000..14dc4ffdf --- /dev/null +++ b/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.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: elastic/elasticsearch:7.14.0 + 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: 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 12a3cf20c..f7d763711 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