Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
isula-build
提交
0263834f
I
isula-build
项目概览
openeuler
/
isula-build
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
isula-build
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0263834f
编写于
8月 20, 2020
作者:
X
xiadanni
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tests:remove images after building and add isulad output
Signed-off-by:
N
xiadanni
<
xiadanni1@huawei.com
>
上级
fe87cff1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
42 addition
and
8 deletion
+42
-8
hack/dockerfile_tests.sh
hack/dockerfile_tests.sh
+42
-8
未找到文件。
hack/dockerfile_tests.sh
浏览文件 @
0263834f
...
...
@@ -45,31 +45,39 @@ function start_isula_builder() {
# test build image without output
function
test_build_without_output
()
{
if
!
isula-build ctr-img build
>
/tmp/buildlog-client 2>&1
;
then
tmpiidfile
=
$(
mktemp
-t
iid.XXX
)
if
!
isula-build ctr-img build
--iidfile
"
$tmpiidfile
"
>
/tmp/buildlog-client 2>&1
;
then
echo
"FAIL"
echo
"LOG DIR:/tmp/buildlog-client and /tmp/buildlog-daemon (build without output)"
kill
-9
"
${
pidofbuilder
}
"
exit
1
fi
image_clean
}
# test build image with docker-archive output
function
test_build_with_docker_archive_output
()
{
if
!
isula-build ctr-img build
--output
=
docker-archive:/tmp/
"
${
image_name
}
"
.tar
>
/tmp/buildlog-client 2>&1
;
then
tmpiidfile
=
$(
mktemp
-t
iid.XXX
)
if
!
isula-build ctr-img build
--iidfile
"
$tmpiidfile
"
--output
=
docker-archive:/tmp/
"
${
image_name
}
"
.tar
>
/tmp/buildlog-client 2>&1
;
then
echo
"FAIL"
echo
"LOG DIR:/tmp/buildlog-client and /tmp/buildlog-daemon (build with docker-archive output)"
kill
-9
"
${
pidofbuilder
}
"
exit
1
else
rm
-f
/tmp/
"
${
dockerfiledir
}
"
.tar
rm
-f
/tmp/
"
${
image_name
}
"
.tar
fi
image_clean
}
# test build image with docker-daemon output
function
test_build_with_docker_daemon_output
()
{
# test build image with docker-daemon output
if
!
isula-build ctr-img build
--output
=
docker-daemon:isula/
"
${
image_name
}
"
:latest
>
/tmp/buildlog-client 2>&1
;
then
systemctl status docker
>
/dev/null 2>&1
if
[
$?
-ne
0
]
;
then
return
0
fi
tmpiidfile
=
$(
mktemp
-t
iid.XXX
)
if
!
isula-build ctr-img build
--iidfile
"
$tmpiidfile
"
--output
=
docker-daemon:isula/
"
${
image_name
}
"
:latest
>
/tmp/buildlog-client 2>&1
;
then
echo
"FAIL"
echo
"LOG DIR:/tmp/buildlog-client and /tmp/buildlog-daemon (build with docker-daemon output)"
kill
-9
"
${
pidofbuilder
}
"
...
...
@@ -77,6 +85,32 @@ function test_build_with_docker_daemon_output() {
else
docker rmi isula/
"
${
image_name
}
"
>
/dev/null 2>&1
fi
image_clean
}
# test build image with isulad output
function
test_build_with_isulad_output
()
{
systemctl status isulad
>
/dev/null 2>&1
if
[
$?
-ne
0
]
;
then
return
0
fi
tmpiidfile
=
$(
mktemp
-t
iid.XXX
)
if
!
isula-build ctr-img build
--iidfile
"
$tmpiidfile
"
--output
=
isulad:isula/
"
${
image_name
}
"
:latest
>
/tmp/buildlog-client 2>&1
;
then
echo
"FAIL"
echo
"LOG DIR:/tmp/buildlog-client and /tmp/buildlog-daemon (build with isulad output)"
kill
-9
"
${
pidofbuilder
}
"
exit
1
else
isula rmi isula/
"
${
image_name
}
"
>
/dev/null 2>&1
fi
image_clean
}
function
image_clean
()
{
imageID
=
$(
cat
"
$tmpiidfile
"
)
isula-build ctr-img
rm
"
$imageID
"
>
/dev/null
rm
-f
"
$tmpiidfile
"
}
# start build images tests
...
...
@@ -92,6 +126,7 @@ function tests() {
test_build_without_output
test_build_with_docker_archive_output
test_build_with_docker_daemon_output
test_build_with_isulad_output
echo
"PASS"
popd
>
/dev/null 2>&1
||
exit
1
...
...
@@ -104,7 +139,6 @@ function cleanup() {
rm
-f
/tmp/buildlog-
*
}
function
main
()
{
pre_check
start_isula_builder
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录