diff --git a/.github/actions/e2e-test/action.yml b/.github/actions/e2e-test/action.yml index 45aaa5c9fe..8c3faabc25 100644 --- a/.github/actions/e2e-test/action.yml +++ b/.github/actions/e2e-test/action.yml @@ -46,6 +46,9 @@ runs: - name: Run E2E Test shell: bash run: | - echo "::group::Run E2E Test ${{ inputs.test_class }}" - ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=${{ inputs.test_class }} + echo "::group::Build E2E Test Modules" + ./mvnw -q -B -f test/e2e/pom.xml clean install + echo "::endgroup::" + echo "::group::Run E2E Test ${{ inputs.test_class }}" + ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false test -Dtest=${{ inputs.test_class }} echo "::endgroup::" diff --git a/.github/workflows/ci-it.yaml b/.github/workflows/ci-it.yaml index 0dbb4ed701..35c0f01803 100644 --- a/.github/workflows/ci-it.yaml +++ b/.github/workflows/ci-it.yaml @@ -82,6 +82,7 @@ jobs: if: env.SKIP_CI != 'true' && matrix.os != 'ubuntu' run: ./mvnw -q --batch-mode -P"backend,ui,dist" clean verify install - uses: actions/upload-artifact@v2 + if: env.SKIP_CI != 'true' && matrix.os == 'ubuntu' && matrix.java-version == '8' name: Upload Agent with: name: dist diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml index e86494989b..9ea4c0ed11 100644 --- a/.github/workflows/e2e.istio.yaml +++ b/.github/workflows/e2e.istio.yaml @@ -144,7 +144,8 @@ jobs: export WEBAPP_HOST=127.0.0.1 export WEBAPP_PORT=8080 - ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.mesh.ALSE2E + ./mvnw -q -B -f test/e2e/pom.xml clean install + ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false test -Dtest=org.apache.skywalking.e2e.mesh.ALSE2E - name: Logs if: ${{ failure() }} @@ -271,7 +272,8 @@ jobs: export WEBAPP_HOST=127.0.0.1 export WEBAPP_PORT=8080 - ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.mesh.MetricsServiceE2E + ./mvnw -q -B -f test/e2e/pom.xml clean install + ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false test -Dtest=org.apache.skywalking.e2e.mesh.MetricsServiceE2E - name: Logs if: ${{ failure() }} diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml index bc7daf68dd..f96ed62dbe 100644 --- a/.github/workflows/e2e.profiling.yaml +++ b/.github/workflows/e2e.profiling.yaml @@ -39,9 +39,17 @@ jobs: timeout-minutes: 90 strategy: matrix: - storage: ['h2', 'mysql', 'es6', 'es7', 'influxdb'] + storage: ['h2', 'mysql', 'es', 'influxdb'] + include: + - { storage: es, es-version: 6.3.2 } + - { storage: es, es-version: 7.0.0 } + - { storage: es, es-version: 7.8.0 } + - { storage: es, es-version: 7.10.1 } + - { storage: es, es-version: 7.14.0 } + - { storage: es, es-version: 7.15.0 } env: SW_STORAGE: ${{ matrix.storage }} + ES_VERSION: ${{ matrix.es-version }} steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index ea4ba9c7e2..3ff68f6148 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -36,9 +36,17 @@ jobs: timeout-minutes: 90 strategy: matrix: - storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'es7.14', 'opensearch', 'influxdb', 'tidb', 'postgresql'] + storage: ['mysql', 'influxdb', 'tidb', 'postgresql'] #opensearch + include: + - { storage: es, es-version: 6.3.2 } + - { storage: es, es-version: 7.0.0 } + - { storage: es, es-version: 7.8.0 } + - { storage: es, es-version: 7.10.1 } + - { storage: es, es-version: 7.14.0 } + - { storage: es, es-version: 7.15.0 } env: SW_STORAGE: ${{ matrix.storage }} + ES_VERSION: ${{ matrix.es-version }} steps: - uses: actions/checkout@v2 with: diff --git a/CHANGES.md b/CHANGES.md index b84b43b59d..76d2df0e26 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,7 +6,8 @@ Release Notes. ------------------ #### OAP Server - +* Fix wrong (de)serializer of ElasticSearch client for OpenSearch storage. +* Fix that traces query with tags will report error. #### UI diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml index a66a6c9ee3..65de5ad079 100644 --- a/apm-dist/src/main/assembly/binary.xml +++ b/apm-dist/src/main/assembly/binary.xml @@ -77,6 +77,11 @@ oap-libs + + ${project.basedir}/../oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/target/skywalking-tools-exporter-assembly/skywalking-tools-exporter/libs + oap-libs + + ${project.basedir}/../tools/profile-exporter diff --git a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java index 80af3dc4cc..5e78d340dd 100644 --- a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java +++ b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java @@ -43,7 +43,7 @@ public final class ElasticSearchVersion { if (distribution.equalsIgnoreCase("OpenSearch")) { requestFactory = new V78RequestFactory(this); - codec = V7Codec.INSTANCE; + codec = V78Codec.INSTANCE; return; } diff --git a/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java b/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java index 82ab79c438..d92112fd55 100644 --- a/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java +++ b/oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java @@ -52,23 +52,54 @@ import static org.junit.Assert.assertTrue; public class ITElasticSearchTest { @Parameterized.Parameters(name = "version: {0}") - public static Collection versions() { + public static Collection es() { return Arrays.asList(new Object[][] { - {"6.3.2"}, {"7.4.2"}, {"7.8.0"}, {"7.10.2"} + { + "ElasticSearch 6.3.2", + new ElasticsearchContainer( + DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") + .withTag("6.3.2")) + }, + { + "ElasticSearch 7.4.2", + new ElasticsearchContainer( + DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") + .withTag("7.4.2")) + }, + { + "ElasticSearch 7.8.0", + new ElasticsearchContainer( + DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") + .withTag("7.8.0")) + }, + { + "ElasticSearch 7.15.0", + new ElasticsearchContainer( + DockerImageName.parse("elastic/elasticsearch") + .withTag("7.15.0") + .asCompatibleSubstituteFor( + "docker.elastic.co/elasticsearch/elasticsearch-oss")) + }, + { + "OpenSearch 1.0.0", + new ElasticsearchContainer( + DockerImageName.parse("opensearchproject/opensearch") + .withTag("1.0.0") + .asCompatibleSubstituteFor( + "docker.elastic.co/elasticsearch/elasticsearch-oss")) + .withEnv("plugins.security.disabled", "true") + } }); } - private final String version; - - private ElasticsearchContainer server; + @Parameterized.Parameter + public String ignored; + @Parameterized.Parameter(1) + public ElasticsearchContainer server; private ElasticSearch client; @Before public void setup() { - server = new ElasticsearchContainer( - DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") - .withTag(version) - ); server.start(); client = ElasticSearch.builder() diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java index 61576459b8..b4972fb49a 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java @@ -121,7 +121,7 @@ public class TraceQueryEsDAO extends EsDAO implements ITraceQueryDAO { } if (CollectionUtils.isNotEmpty(tags)) { BoolQueryBuilder tagMatchQuery = Query.bool(); - tags.forEach(tag -> tagMatchQuery.must(Query.term(SegmentRecord.TAGS, tag))); + tags.forEach(tag -> tagMatchQuery.must(Query.term(SegmentRecord.TAGS, tag.toString()))); query.must(tagMatchQuery); } search.size(limit).from(from); diff --git a/oap-server/server-tools/profile-exporter/pom.xml b/oap-server/server-tools/profile-exporter/pom.xml index 4d45b456ac..00c052aaf8 100644 --- a/oap-server/server-tools/profile-exporter/pom.xml +++ b/oap-server/server-tools/profile-exporter/pom.xml @@ -33,6 +33,5 @@ tool-profile-snapshot-server-mock tool-profile-snapshot-bootstrap tool-profile-snapshot-exporter - tool-profile-snapshot-exporter-es diff --git a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/pom.xml b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/pom.xml index 1ba017f570..46652e43e3 100644 --- a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/pom.xml +++ b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/pom.xml @@ -42,19 +42,6 @@ ${project.version} - - - - org.apache.skywalking - storage-jdbc-hikaricp-plugin - ${project.version} - - - org.apache.skywalking - storage-influxdb-plugin - ${project.version} - - diff --git a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter-es/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporter.java b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter-es/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporter.java deleted file mode 100644 index fa2e293bc9..0000000000 --- a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter-es/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporter.java +++ /dev/null @@ -1,28 +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. - * - */ - -package org.apache.skywalking.oap.server.tool.profile.exporter; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class ProfileSnapshotExporter { - public static void main(String[] args) { - ProfileSnapshotExporterBootstrap.export(args); - } -} diff --git a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/pom.xml b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/pom.xml index b07142940b..be336f2108 100644 --- a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/pom.xml +++ b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/pom.xml @@ -34,11 +34,29 @@ tool-profile-snapshot-bootstrap ${project.version} - - - org.apache.skywalking - storage-elasticsearch-plugin - ${project.version} - + + + skywalking-tools-exporter + + + org.apache.maven.plugins + maven-assembly-plugin + + + assembly + package + + single + + + + src/main/assembly/assembly.xml + + + + + + + diff --git a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter-es/pom.xml b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/src/main/assembly/assembly.xml similarity index 50% rename from oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter-es/pom.xml rename to oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/src/main/assembly/assembly.xml index 4b8dbf19d5..bc3202b07c 100644 --- a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter-es/pom.xml +++ b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-exporter/src/main/assembly/assembly.xml @@ -1,4 +1,3 @@ - - - - profile-exporter - org.apache.skywalking - 8.9.0-SNAPSHOT - - 4.0.0 - - tool-profile-snapshot-exporter-es7 - 8.9.0-SNAPSHOT - - - - org.apache.skywalking - tool-profile-snapshot-bootstrap - ${project.version} - - - - + + assembly + + dir + + + + /libs + runtime + + + diff --git a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-server-mock/pom.xml b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-server-mock/pom.xml index 99f3d2fb50..9cbf877dea 100644 --- a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-server-mock/pom.xml +++ b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-server-mock/pom.xml @@ -25,7 +25,6 @@ 4.0.0 - org.apache.skywalking tool-profile-snapshot-server-mock 8.9.0-SNAPSHOT @@ -37,4 +36,4 @@ - \ No newline at end of file + diff --git a/test/e2e/e2e-service-provider/pom.xml b/test/e2e/e2e-service-provider/pom.xml index 8862f0f7eb..7e133b9846 100644 --- a/test/e2e/e2e-service-provider/pom.xml +++ b/test/e2e/e2e-service-provider/pom.xml @@ -70,11 +70,15 @@ log4j ${log4j.version} + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + org.apache.logging.log4j log4j-core ${log4j2.version} - provided ch.qos.logback diff --git a/test/e2e/e2e-test/docker/Dockerfile.cli b/test/e2e/e2e-test/docker/Dockerfile.cli deleted file mode 100644 index 1071870ac3..0000000000 --- a/test/e2e/e2e-test/docker/Dockerfile.cli +++ /dev/null @@ -1,33 +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. - -FROM golang:1.14 AS builder - -ARG COMMIT_HASH=ae085deb32434a0859e49c45819fed7a5c4010b5 -ARG CLI_CODE=${COMMIT_HASH}.tar.gz -ARG CLI_CODE_URL=https://github.com/apache/skywalking-cli/archive/${CLI_CODE} - -ENV CGO_ENABLED=0 -ENV GO111MODULE=on - -WORKDIR /cli - -ADD ${CLI_CODE_URL} . -RUN tar -xf ${CLI_CODE} --strip 1 -RUN rm ${CLI_CODE} - -RUN make build && mv bin/swctl-latest-linux-amd64 /swctl - -ENTRYPOINT [ "/swctl" ] diff --git a/test/e2e/e2e-test/docker/event/docker-compose.yml b/test/e2e/e2e-test/docker/event/docker-compose.yml index 81269577b4..720b5d1009 100644 --- a/test/e2e/e2e-test/docker/event/docker-compose.yml +++ b/test/e2e/e2e-test/docker/event/docker-compose.yml @@ -25,9 +25,7 @@ services: condition: service_healthy cli: - build: - context: . - dockerfile: ../Dockerfile.cli + image: ghcr.io/apache/skywalking-cli/skywalking-cli:401e0e5671a3fb49de1d1e1e89f5b693b2062867 networks: - e2e entrypoint: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml b/test/e2e/e2e-test/docker/profile/docker-compose.es.yml similarity index 96% rename from test/e2e/e2e-test/docker/profile/docker-compose.es7.yml rename to test/e2e/e2e-test/docker/profile/docker-compose.es.yml index 6b40e19332..511998353c 100644 --- a/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml +++ b/test/e2e/e2e-test/docker/profile/docker-compose.es.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.4.2 + image: elastic/elasticsearch:${ES_VERSION} expose: - 9200 networks: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml b/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml deleted file mode 100644 index b80079ac33..0000000000 --- a/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml +++ /dev/null @@ -1,45 +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. - -version: '2.1' - -services: - es: - image: elastic/elasticsearch:6.3.2 - 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 - environment: - SW_STORAGE: elasticsearch - depends_on: - es: - condition: service_healthy - -networks: - e2e: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es.yml similarity index 96% rename from test/e2e/e2e-test/docker/storage/docker-compose.es6.yml rename to test/e2e/e2e-test/docker/storage/docker-compose.es.yml index 9cc21be88f..c416695e2c 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.es.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:6.3.2 + image: elastic/elasticsearch:${ES_VERSION} expose: - 9200 networks: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml deleted file mode 100644 index 2702f08150..0000000000 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.0.yml +++ /dev/null @@ -1,47 +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. - -version: '2.1' - -services: - es: - image: elastic/elasticsearch:7.0.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 - environment: - SW_STORAGE: elasticsearch - 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.es7.10.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml deleted file mode 100644 index 8e4384e00d..0000000000 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.10.yml +++ /dev/null @@ -1,47 +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. - -version: '2.1' - -services: - es: - image: elastic/elasticsearch:7.10.1 - 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 - environment: - SW_STORAGE: elasticsearch - 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.es7.14.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml deleted file mode 100644 index 53ce509e87..0000000000 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.14.yml +++ /dev/null @@ -1,47 +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. - -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 - environment: - SW_STORAGE: elasticsearch - SW_PROMETHEUS_FETCHER: "default" - SW_TELEMETRY: prometheus - depends_on: - es: - condition: service_healthy - -networks: - e2e: diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml index 3b7f234de9..825db9870c 100644 --- a/test/e2e/pom.xml +++ b/test/e2e/pom.xml @@ -58,6 +58,7 @@ 2.22.0 3.8.0 3.1.0 + 2.22.0 1.15.3 @@ -191,6 +192,11 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} +