Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
15e11226
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
15e11226
编写于
5月 14, 2021
作者:
Z
Zhenxu Ke
提交者:
GitHub
5月 14, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace OpenSearch self-built docker image with official one (#6938)
上级
9ba6deb2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
32 deletion
+4
-32
.github/workflows/e2e.storages.yaml
.github/workflows/e2e.storages.yaml
+0
-4
test/e2e/e2e-test/docker/build-opensearch.sh
test/e2e/e2e-test/docker/build-opensearch.sh
+0
-27
test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
...e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
+4
-1
未找到文件。
.github/workflows/e2e.storages.yaml
浏览文件 @
15e11226
...
...
@@ -49,10 +49,6 @@ jobs:
restore-keys
:
|
${{ runner.os }}-maven-
-
name
:
Build OpenSearch
if
:
env.SKIP_CI != 'true' && 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
...
...
test/e2e/e2e-test/docker/build-opensearch.sh
已删除
100644 → 0
浏览文件 @
9ba6deb2
#
# 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.
#
#
set
-ex
wd
=
$(
mktemp
-d
-t
opensearch-XXXXXXXXXX
)
&&
cd
"
$wd
"
curl
-L
https://github.com/opensearch-project/OpenSearch/archive/1.0.0-beta1.tar.gz
-o
opensearch.tgz
tar
-zxf
opensearch.tgz
--strip-components
=
1
-C
.
./gradlew clean distribution:docker:assemble
-x
test
-x
javadoc
test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
浏览文件 @
15e11226
...
...
@@ -17,7 +17,7 @@ version: '2.1'
services
:
es
:
image
:
opensearch
:test
image
:
opensearch
project/opensearch:1.0.0-beta1
expose
:
-
9200
networks
:
...
...
@@ -25,6 +25,7 @@ services:
environment
:
-
discovery.type=single-node
-
cluster.routing.allocation.disk.threshold_enabled=false
-
opendistro_security.ssl.http.enabled=false
healthcheck
:
test
:
[
"
CMD"
,
"
bash"
,
"
-c"
,
"
cat
<
/dev/null
>
/dev/tcp/127.0.0.1/9200"
]
interval
:
5s
...
...
@@ -39,6 +40,8 @@ services:
SW_STORAGE
:
elasticsearch7
SW_PROMETHEUS_FETCHER
:
"
default"
SW_TELEMETRY
:
prometheus
SW_ES_USER
:
admin
SW_ES_PASSWORD
:
admin
depends_on
:
es
:
condition
:
service_healthy
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录