This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test/opensearch
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard 1e7ff33 Build OpenSearch on the fly instead of using personal image
new dbb623e Build OpenSearch on the fly instead of using personal image
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1e7ff33)
\
N -- N -- N refs/heads/test/opensearch (dbb623e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/e2e/e2e-test/docker/build-opensearch.sh | 2 ++
1 file changed, 2 insertions(+)
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 dbb623e78091689769723e02f5299c79b509b289
Author: kezhenxu94 <ke...@apache.org>
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} | 50 ++++++++--------------
...search1.0.yml => docker-compose.opensearch.yml} | 2 +-
3 files changed, 25 insertions(+), 34 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..e0d67bc 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,21 @@
# 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
+
+git checkout 1.0.0-beta1
+
+./gradlew assemble -x test
+
+cd distribution/docker/build/docker
+
+docker build . -t opensearch
-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:
+docker images -a
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: