Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
8d83ffb1
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8d83ffb1
编写于
6月 09, 2020
作者:
O
openeuler-ci-bot
提交者:
Gitee
6月 09, 2020
浏览文件
操作
浏览文件
下载
差异文件
!431 Enhance health check configuration verification
Merge pull request !431 from JingWoo/masterx
上级
2448d4b4
ffe2dc0f
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
10 addition
and
14 deletion
+10
-14
src/connect/client/grpc/grpc_isula_image_client.cc
src/connect/client/grpc/grpc_isula_image_client.cc
+1
-1
src/image/oci/oci_config_merge.c
src/image/oci/oci_config_merge.c
+1
-6
test/image/oci/oci_config_merge/oci_config_merge_llt.cc
test/image/oci/oci_config_merge/oci_config_merge_llt.cc
+1
-1
test/test.sh
test/test.sh
+3
-2
tools/static_check
tools/static_check
+4
-4
未找到文件。
src/connect/client/grpc/grpc_isula_image_client.cc
浏览文件 @
8d83ffb1
...
...
@@ -69,7 +69,7 @@ static int copy_image_health_check_config(const isula::Image &gimage, struct ima
int
ret
=
0
;
defs_health_check
*
health_check
=
nullptr
;
if
(
!
gimage
.
has_healthcheck
())
{
if
(
!
gimage
.
has_healthcheck
()
||
gimage
.
healthcheck
().
test_size
()
==
0
)
{
return
0
;
}
...
...
src/image/oci/oci_config_merge.c
浏览文件 @
8d83ffb1
...
...
@@ -300,15 +300,10 @@ static int oci_image_merge_health_check(const defs_health_check *image_health_ch
{
int
ret
=
0
;
if
(
image_health_check
==
NULL
)
{
if
(
image_health_check
==
NULL
||
image_health_check
->
test_len
==
0
)
{
return
0
;
}
if
(
image_health_check
->
test_len
==
0
)
{
ERROR
(
"health check commands required"
);
return
-
1
;
}
if
(
container_spec
->
health_check
==
NULL
)
{
if
(
dup_health_check_from_image
(
image_health_check
,
container_spec
)
!=
0
)
{
ret
=
-
1
;
...
...
test/image/oci/oci_config_merge/oci_config_merge_llt.cc
浏览文件 @
8d83ffb1
...
...
@@ -404,7 +404,7 @@ TEST(oci_config_merge_llt, test_oci_image_merge_config)
custom_config
=
(
container_config
*
)
util_common_calloc_s
(
sizeof
(
container_config
));
ASSERT_TRUE
(
custom_config
!=
NULL
);
ASSERT_
NE
(
oci_image_merge_config
(
tool_image
,
custom_config
),
0
);
ASSERT_
EQ
(
oci_image_merge_config
(
tool_image
,
custom_config
),
0
);
free_imagetool_image
(
tool_image
);
tool_image
=
NULL
;
...
...
test/test.sh
浏览文件 @
8d83ffb1
#! /bin/bash
#set -xe
#######################################################################
##- @Copyright (C) Huawei Technologies., Ltd. 2019. All rights reserved.
# - iSulad licensed under the Mulan PSL v2.
...
...
@@ -12,9 +15,7 @@
##- @Author: wujing
##- @Create: 2019-04-25
#######################################################################
#! /bin/bash
#set -xe
function
usage
()
{
...
...
tools/static_check
浏览文件 @
8d83ffb1
#!/bin/bash
#
# This script is the implementation portal for the iSulad project Personal level build static check.
# set -euxo pipefail
#######################################################################
##- @Copyright (C) Huawei Technologies., Ltd. 2019. All rights reserved.
# - iSulad licensed under the Mulan PSL v2.
...
...
@@ -12,10 +16,6 @@
##- @Author: wujing
##- @Create: 2019-04-25
#######################################################################
#!/bin/bash
#
# This script is the implementation portal for the iSulad project Personal level build static check.
# set -euxo pipefail
CURRENT_PATH
=
$(
pwd
)
CI_TOOLS_PROJECT
=
"/root/workspace/ci_tools"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录