Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
faea66f8
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
faea66f8
编写于
7月 21, 2021
作者:
Q
quicksilver
提交者:
GitHub
7月 21, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[skip ci] To specify timeout period of e2e test. (#6691)
Signed-off-by:
N
quicksilver
<
zhifeng.zhang@zilliz.com
>
上级
26f890b5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
21 deletion
+25
-21
build/ci/jenkins/Jenkinsfile
build/ci/jenkins/Jenkinsfile
+7
-8
build/ci/jenkins/NightlyCI.groovy
build/ci/jenkins/NightlyCI.groovy
+7
-8
tests/scripts/e2e-k8s.sh
tests/scripts/e2e-k8s.sh
+11
-5
未找到文件。
build/ci/jenkins/Jenkinsfile
浏览文件 @
faea66f8
#
!
/usr/
bin
/
env
groovy
int
timeout_minutes
=
45
int
delay_minutes
=
5
int
ci_timeout
=
(
timeout_minutes
-
delay_minutes
)
*
60
int
total_timeout_minutes
=
60
int
e2e_timeout_seconds
=
30
*
60
pipeline
{
agent
none
options
{
timestamps
()
timeout
(
time:
timeout_minutes
,
unit:
'MINUTES'
)
timeout
(
time:
t
otal_t
imeout_minutes
,
unit:
'MINUTES'
)
buildDiscarder
logRotator
(
artifactDaysToKeepStr:
'30'
)
// parallelsAlwaysFailFast()
...
...
@@ -58,20 +57,20 @@ pipeline {
if
(
"${MILVUS_CLIENT}"
==
"pymilvus"
)
{
sh
"""
MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
timeout -v ${ci_timeout} \
./e2e-k8s.sh \
--node-image registry.zilliz.com/kindest/node:v1.20.2 \
--kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
--test-extra-arg "--tags=smoke"
--test-extra-arg "--tags=smoke" \
--test-timeout ${e2e_timeout_seconds}
"""
}
else
if
(
"${MILVUS_CLIENT}"
==
"pymilvus-orm"
)
{
sh
"""
MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
timeout -v ${ci_timeout} \
./e2e-k8s.sh \
--node-image registry.zilliz.com/kindest/node:v1.20.2 \
--kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
--test-extra-arg "--tags L0 L1"
--test-extra-arg "--tags L0 L1" \
--test-timeout ${e2e_timeout_seconds}
"""
}
else
{
error
"Error: Unsupported Milvus client: ${MILVUS_CLIENT}"
...
...
build/ci/jenkins/NightlyCI.groovy
浏览文件 @
faea66f8
...
...
@@ -5,9 +5,8 @@
String
cron_timezone
=
"TZ=Asia/Shanghai"
String
cron_string
=
BRANCH_NAME
==
"master"
?
"50 22 * * * "
:
""
int
timeout_minutes
=
90
int
delay_minutes
=
5
int
ci_timeout
=
(
timeout_minutes
-
delay_minutes
)
*
60
int
total_timeout_minutes
=
90
int
e2e_timeout_seconds
=
60
*
60
pipeline
{
agent
none
...
...
@@ -17,7 +16,7 @@ pipeline {
}
options
{
timestamps
()
timeout
(
time:
timeout_minutes
,
unit:
'MINUTES'
)
timeout
(
time:
t
otal_t
imeout_minutes
,
unit:
'MINUTES'
)
buildDiscarder
logRotator
(
artifactDaysToKeepStr:
'30'
)
// parallelsAlwaysFailFast()
}
...
...
@@ -66,19 +65,19 @@ pipeline {
if
(
"${MILVUS_CLIENT}"
==
"pymilvus"
)
{
sh
"""
MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
timeout -v ${ci_timeout} \
./e2e-k8s.sh \
--kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
--node-image registry.zilliz.com/kindest/node:v1.20.2
--node-image registry.zilliz.com/kindest/node:v1.20.2 \
--test-timeout ${e2e_timeout_seconds}
"""
}
else
if
(
"${MILVUS_CLIENT}"
==
"pymilvus-orm"
)
{
sh
"""
MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
timeout -v ${ci_timeout} \
./e2e-k8s.sh \
--kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
--node-image registry.zilliz.com/kindest/node:v1.20.2 \
--test-extra-arg "--tags L0 L1 L2"
--test-extra-arg "--tags L0 L1 L2" \
--test-timeout ${e2e_timeout_seconds}
"""
}
else
{
error
"Error: Unsupported Milvus client: ${MILVUS_CLIENT}"
...
...
tests/scripts/e2e-k8s.sh
浏览文件 @
faea66f8
...
...
@@ -65,6 +65,10 @@ while (( "$#" )); do
TEST_EXTRA_ARG
=
$2
shift
2
;;
--test-timeout
)
TEST_TIMEOUT
=
$2
shift
2
;;
--skip-setup
)
SKIP_SETUP
=
true
shift
...
...
@@ -77,10 +81,6 @@ while (( "$#" )); do
SKIP_CLEANUP
=
true
shift
;;
--install-logger
)
CRON_LOGGER_INSTALL
=
true
shift
;;
--skip-build
)
SKIP_BUILD
=
true
shift
...
...
@@ -132,6 +132,8 @@ Usage:
--test-extra-arg Run e2e test extra configuration
For example,
\"
--tag=smoke
\"
--test-timeout To specify timeout period of e2e test. Timeout time is specified in seconds.
--topology KinD cluster topology of deployments
Provides three classes:
\"
SINGLE_CLUSTER
\"
,
\"
MULTICLUSTER_SINGLE_NETWORK
\"
,
\"
MULTICLUSTER
\"
Default:
\"
SINGLE_CLUSTER
\"
...
...
@@ -283,7 +285,11 @@ if [[ -z "${SKIP_INSTALL:-}" ]]; then
fi
if
[[
-z
"
${
SKIP_TEST
:-}
"
]]
;
then
trace
"test"
"
${
ROOT
}
/tests/scripts/e2e.sh"
"
${
TEST_EXTRA_ARG
}
"
if
[[
-n
"
${
TEST_TIMEOUT
:-}
"
]]
;
then
trace
"test"
"timeout"
"-v"
"
${
TEST_TIMEOUT
}
"
"
${
ROOT
}
/tests/scripts/e2e.sh"
"
${
TEST_EXTRA_ARG
}
"
else
trace
"test"
"
${
ROOT
}
/tests/scripts/e2e.sh"
"
${
TEST_EXTRA_ARG
}
"
fi
fi
# Check if the user is running the clusters in manual mode.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录