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 1e7ff33b901a5d77fe8b194df420c936e410ed30 Author: kezhenxu94 <[email protected]> AuthorDate: Sat May 8 22:35:52 2021 +0800 Build OpenSearch on the fly instead of using personal image --- .github/workflows/e2e.storages.yaml | 7 +++- ...mpose.opensearch1.0.yml => build-opensearch.sh} | 42 +++++++--------------- ...search1.0.yml => docker-compose.opensearch.yml} | 2 +- 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 8372e7f..a4c3c62 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -34,7 +34,7 @@ jobs: timeout-minutes: 90 strategy: matrix: - storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'opensearch1.0', 'influxdb', 'tidb', 'postgresql'] + storage: ['mysql', 'es6', 'es7.0', 'es7.10', 'opensearch', 'influxdb', 'tidb', 'postgresql'] env: SW_STORAGE: ${{ matrix.storage }} steps: @@ -51,6 +51,11 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- + + - name: Build OpenSearch + if: 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/storage/docker-compose.opensearch1.0.yml b/test/e2e/e2e-test/docker/build-opensearch.sh similarity index 53% copy from test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml copy to test/e2e/e2e-test/docker/build-opensearch.sh index b30f2d1..f803e2e 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml +++ b/test/e2e/e2e-test/docker/build-opensearch.sh @@ -1,3 +1,4 @@ +# # 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. @@ -12,36 +13,19 @@ # 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 + +cd /tmp + +git clone https://github.com/opensearch-project/OpenSearch.git && cd OpenSearch -version: '2.1' +git checkout 1.0.0-beta1 -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 +./gradlew assemble -x test - 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 +cd distribution/docker/build/docker -networks: - e2e: +docker build . -t opensearch diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml similarity index 96% rename from test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml rename to test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml index b30f2d1..8e68c2c 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch1.0.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: kezhenxu94/opensearch:1.0.0-beta1 + image: opensearch expose: - 9200 networks:
