Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
5b467d36
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,发现更多精彩内容 >>
提交
5b467d36
编写于
6月 04, 2020
作者:
O
openeuler-ci-bot
提交者:
Gitee
6月 04, 2020
浏览文件
操作
浏览文件
下载
差异文件
!419 CI adds code coverage analysis
Merge pull request !419 from JingWoo/master
上级
12096f2a
16b68d8a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
16 deletion
+16
-16
CI/Dockerfile
CI/Dockerfile
+2
-0
CI/build.sh
CI/build.sh
+4
-2
CI/make-and-install.sh
CI/make-and-install.sh
+10
-14
未找到文件。
CI/Dockerfile
浏览文件 @
5b467d36
...
...
@@ -65,6 +65,8 @@ RUN yum clean all && yum makecache && yum install -y epel-release && yum swap -y
device-mapper-devel
\
libarchive
\
libarchive-devel
\
libtar
\
libtar-devel
\
libcurl-devel
\
zlib-devel
\
glibc-headers
\
...
...
CI/build.sh
浏览文件 @
5b467d36
...
...
@@ -399,14 +399,16 @@ if [[ "x${enable_gcov}" == "xON" ]]; then
tar
xf ./isulad-gcov.tar.gz
rm
-rf
/var/www/html/isulad-gcov
rm
-rf
/var/www/html/isulad-gcov.tar.gz
mv
./tmp/isulad-gcov /var/www/html
mv
./tmp/isulad-gcov /var/www/html
/isulad-gcov
cp
isulad-gcov.tar.gz /var/www/html
rm
-rf
./tmp
tar
xf ./isulad-llt-gcov.tar.gz
rm
-rf
/var/www/html/isulad-llt-gcov
rm
-rf
/var/www/html/isulad-llt-gcov.tar.gz
mv
./coverage /var/www/html
mv
./coverage /var/www/html
/isulad-llt-gcov
cp
isulad-llt-gcov.tar.gz /var/www/html
rm
-rf
./coverage
fi
if
[[
-e
$CIDIR
/
${
CONTAINER_NAME
}
.runflag
]]
;
then
...
...
CI/make-and-install.sh
浏览文件 @
5b467d36
...
...
@@ -90,32 +90,28 @@ echo_success "===================RUN DT-LLT TESTCASES END=======================
cd
$ISULAD_COPY_PATH
sed
-i
's/fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO/fd == 0 || fd == 1 || fd == 2 || fd >= 1000/g'
./src/cutils/utils.c
#build grpc version
# build rest version
cd
$ISULAD_COPY_PATH
rm
-rf
build
mkdir
build
cd
build
if
[[
${
enable_gcov
}
-ne
1
]]
;
then
cmake
-DLIB_INSTALL_DIR
=
${
builddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
builddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
builddir
}
/etc
-DCMAKE_BUILD_TYPE
=
debug
-DGCOV
=
ON
-DENABLE_EMBEDDED
=
ON ..
else
cmake
-DLIB_INSTALL_DIR
=
${
builddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
builddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
builddir
}
/etc
-DENABLE_EMBEDDED
=
ON ..
fi
cmake
-DLIB_INSTALL_DIR
=
${
restbuilddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
restbuilddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
restbuilddir
}
/etc
-DENABLE_EMBEDDED
=
ON
-DENABLE_GRPC
=
OFF
-DDISABLE_OCI
=
ON ..
make
-j
$(
nproc
)
make
install
sed
-i
's/"log-driver": "stdout"/"log-driver": "file"/g'
${
builddir
}
/etc/isulad/daemon.json
sed
-i
"/registry-mirrors/a
\
\"
https://hub-mirror.c.163.com
\"
"
${
builddir
}
/etc/isulad/daemon.json
sed
-i
's/"log-driver": "stdout"/"log-driver": "file"/g'
${
rest
builddir
}
/etc/isulad/daemon.json
sed
-i
"/registry-mirrors/a
\
\"
https://hub-mirror.c.163.com
\"
"
${
rest
builddir
}
/etc/isulad/daemon.json
#
build rest
version
#
build grpc
version
cd
$ISULAD_COPY_PATH
rm
-rf
build
mkdir
build
cd
build
if
[[
${
enable_gcov
}
-ne
0
]]
;
then
cmake
-DLIB_INSTALL_DIR
=
${
restbuilddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
restbuilddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
restbuilddir
}
/etc
-DCMAKE_BUILD_TYPE
=
debug
-DGCOV
=
ON
-DENABLE_EMBEDDED
=
ON
-DENABLE_GRPC
=
OFF
-DDISABLE_OCI
=
ON ..
cmake
-DLIB_INSTALL_DIR
=
${
builddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
builddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
builddir
}
/etc
-DCMAKE_BUILD_TYPE
=
debug
-DGCOV
=
ON
-DENABLE_EMBEDDED
=
ON ..
else
cmake
-DLIB_INSTALL_DIR
=
${
restbuilddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
restbuilddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
restbuilddir
}
/etc
-DENABLE_EMBEDDED
=
ON
-DENABLE_GRPC
=
OFF
-DDISABLE_OCI
=
ON ..
cmake
-DLIB_INSTALL_DIR
=
${
builddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
builddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
builddir
}
/etc
-DENABLE_EMBEDDED
=
ON ..
fi
make
-j
$(
nproc
)
make
install
sed
-i
's/"log-driver": "stdout"/"log-driver": "file"/g'
${
rest
builddir
}
/etc/isulad/daemon.json
sed
-i
"/registry-mirrors/a
\
\"
https://hub-mirror.c.163.com
\"
"
${
rest
builddir
}
/etc/isulad/daemon.json
sed
-i
's/"log-driver": "stdout"/"log-driver": "file"/g'
${
builddir
}
/etc/isulad/daemon.json
sed
-i
"/registry-mirrors/a
\
\"
https://hub-mirror.c.163.com
\"
"
${
builddir
}
/etc/isulad/daemon.json
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录