Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_35024513
milvus
提交
43fa6db9
milvus
项目概览
qq_35024513
/
milvus
与 Fork 源项目一致
Fork自
milvus / milvus
通知
14
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
43fa6db9
编写于
12月 17, 2019
作者:
Q
quicksilver
提交者:
GitHub
12月 17, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #774 from ZhifengZhang-CN/master
Add CentOS 7 build case on Jenkins CI
上级
7c02c376
c32f58d4
变更
15
展开全部
隐藏空白更改
内联
并排
Showing
15 changed file
with
218 addition
and
247 deletion
+218
-247
ci/jenkins/Jenkinsfile
ci/jenkins/Jenkinsfile
+104
-218
ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml
ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml
+38
-0
ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml
...ins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml
+3
-1
ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml
ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml
+39
-0
ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml
...ins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml
+3
-1
ci/jenkins/step/build.groovy
ci/jenkins/step/build.groovy
+3
-3
ci/jenkins/step/deploySingle2Dev.groovy
ci/jenkins/step/deploySingle2Dev.groovy
+1
-1
ci/jenkins/step/publishImages.groovy
ci/jenkins/step/publishImages.groovy
+1
-1
ci/jenkins/step/singleDevNightlyTest.groovy
ci/jenkins/step/singleDevNightlyTest.groovy
+1
-1
ci/jenkins/step/singleDevTest.groovy
ci/jenkins/step/singleDevTest.groovy
+1
-1
ci/scripts/check_ccache.sh
ci/scripts/check_ccache.sh
+7
-7
ci/scripts/coverage.sh
ci/scripts/coverage.sh
+13
-6
ci/scripts/update_ccache.sh
ci/scripts/update_ccache.sh
+2
-3
core/cmake/ThirdPartyPackages.cmake
core/cmake/ThirdPartyPackages.cmake
+1
-1
docker-compose.yml
docker-compose.yml
+1
-3
未找到文件。
ci/jenkins/Jenkinsfile
浏览文件 @
43fa6db9
此差异已折叠。
点击以展开。
ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml
0 → 100644
浏览文件 @
43fa6db9
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
milvus-cpu-build-env
labels
:
app
:
milvus
componet
:
cpu-build-env
spec
:
containers
:
-
name
:
milvus-cpu-build-env
image
:
registry.zilliz.com/milvus/milvus-cpu-build-env:v0.7.0-centos7
env
:
-
name
:
POD_IP
valueFrom
:
fieldRef
:
fieldPath
:
status.podIP
-
name
:
OS_NAME
value
:
"
centos7"
-
name
:
BUILD_ENV_IMAGE_ID
value
:
"
225b4d9c26d67b70b476964b4dd6e216de4b464d7a973a8c0c7ed1313c4d81ad"
command
:
-
cat
tty
:
true
resources
:
limits
:
memory
:
"
12Gi"
cpu
:
"
8.0"
requests
:
memory
:
"
8Gi"
cpu
:
"
4.0"
-
name
:
milvus-mysql
image
:
mysql:5.6
env
:
-
name
:
MYSQL_ROOT_PASSWORD
value
:
123456
ports
:
-
containerPort
:
3306
name
:
mysql
ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml
→
ci/jenkins/pod/milvus-cpu-version-
ubuntu18.04-
build-env-pod.yaml
浏览文件 @
43fa6db9
...
...
@@ -8,12 +8,14 @@ metadata:
spec
:
containers
:
-
name
:
milvus-cpu-build-env
image
:
registry.zilliz.com/milvus/milvus-cpu-build-env:v0.
6
.0-ubuntu18.04
image
:
registry.zilliz.com/milvus/milvus-cpu-build-env:v0.
7
.0-ubuntu18.04
env
:
-
name
:
POD_IP
valueFrom
:
fieldRef
:
fieldPath
:
status.podIP
-
name
:
OS_NAME
value
:
"
ubuntu18.04"
-
name
:
BUILD_ENV_IMAGE_ID
value
:
"
23476391bec80c64f10d44a6370c73c71f011a6b95114b10ff82a60e771e11c7"
command
:
...
...
ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml
0 → 100644
浏览文件 @
43fa6db9
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
milvus-gpu-build-env
labels
:
app
:
milvus
componet
:
gpu-build-env
spec
:
containers
:
-
name
:
milvus-gpu-build-env
image
:
registry.zilliz.com/milvus/milvus-gpu-build-env:v0.7.0-centos7
env
:
-
name
:
POD_IP
valueFrom
:
fieldRef
:
fieldPath
:
status.podIP
-
name
:
OS_NAME
value
:
"
centos7"
-
name
:
BUILD_ENV_IMAGE_ID
value
:
"
a5ec9914737ea4727d88ae36b4a73ca5d817f19438ba913cc1de6a1ee2ed2336"
command
:
-
cat
tty
:
true
resources
:
limits
:
memory
:
"
12Gi"
cpu
:
"
8.0"
nvidia.com/gpu
:
1
requests
:
memory
:
"
8Gi"
cpu
:
"
4.0"
-
name
:
milvus-mysql
image
:
mysql:5.6
env
:
-
name
:
MYSQL_ROOT_PASSWORD
value
:
123456
ports
:
-
containerPort
:
3306
name
:
mysql
ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml
→
ci/jenkins/pod/milvus-gpu-version-
ubuntu18.04-
build-env-pod.yaml
浏览文件 @
43fa6db9
...
...
@@ -8,12 +8,14 @@ metadata:
spec
:
containers
:
-
name
:
milvus-gpu-build-env
image
:
registry.zilliz.com/milvus/milvus-gpu-build-env:v0.
6
.0-ubuntu18.04
image
:
registry.zilliz.com/milvus/milvus-gpu-build-env:v0.
7
.0-ubuntu18.04
env
:
-
name
:
POD_IP
valueFrom
:
fieldRef
:
fieldPath
:
status.podIP
-
name
:
OS_NAME
value
:
"
ubuntu18.04"
-
name
:
BUILD_ENV_IMAGE_ID
value
:
"
da9023b0f858f072672f86483a869aa87e90a5140864f89e5a012ec766d96dea"
command
:
...
...
ci/jenkins/step/build.groovy
浏览文件 @
43fa6db9
...
...
@@ -2,10 +2,10 @@ timeout(time: 60, unit: 'MINUTES') {
dir
(
"ci/scripts"
)
{
withCredentials
([
usernamePassword
(
credentialsId:
"${params.JFROG_CREDENTIALS_ID}"
,
usernameVariable:
'USERNAME'
,
passwordVariable:
'PASSWORD'
)])
{
def
checkResult
=
sh
(
script:
"./check_ccache.sh -l ${params.JFROG_ARTFACTORY_URL}/ccache"
,
returnStatus:
true
)
if
(
"${
env.
BINRARY_VERSION}"
==
"gpu"
)
{
sh
"
. ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -g -u -c
"
if
(
"${BINRARY_VERSION}"
==
"gpu"
)
{
sh
"
/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -g -u -c\"
"
}
else
{
sh
"
. ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -u -c
"
sh
"
/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -u -c\"
"
}
sh
"./update_ccache.sh -l ${params.JFROG_ARTFACTORY_URL}/ccache -u ${USERNAME} -p ${PASSWORD}"
}
...
...
ci/jenkins/step/deploySingle2Dev.groovy
浏览文件 @
43fa6db9
...
...
@@ -3,7 +3,7 @@ sh 'helm repo update'
dir
(
'milvus-helm'
)
{
checkout
([
$class
:
'GitSCM'
,
branches:
[[
name:
"0.6.0"
]],
userRemoteConfigs:
[[
url:
"https://github.com/milvus-io/milvus-helm.git"
,
name:
'origin'
,
refspec:
"+refs/heads/0.6.0:refs/remotes/origin/0.6.0"
]]])
dir
(
"milvus"
)
{
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/sqlite_${
env.
BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/sqlite_${BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
}
}
ci/jenkins/step/publishImages.groovy
浏览文件 @
43fa6db9
timeout
(
time:
15
,
unit:
'MINUTES'
)
{
dir
(
"docker/deploy/${
env.BINRARY_VERSION}/${env.
OS_NAME}"
)
{
dir
(
"docker/deploy/${
BINRARY_VERSION}/${
OS_NAME}"
)
{
def
binaryPackage
=
"${PROJECT_NAME}-${PACKAGE_VERSION}.tar.gz"
withCredentials
([
usernamePassword
(
credentialsId:
"${params.JFROG_CREDENTIALS_ID}"
,
usernameVariable:
'JFROG_USERNAME'
,
passwordVariable:
'JFROG_PASSWORD'
)])
{
...
...
ci/jenkins/step/singleDevNightlyTest.groovy
浏览文件 @
43fa6db9
...
...
@@ -13,7 +13,7 @@ timeout(time: 90, unit: 'MINUTES') {
}
dir
(
"milvus-helm"
)
{
dir
(
"milvus"
)
{
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/mysql_${
env.
BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/mysql_${BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
}
}
dir
(
"tests/milvus_python_test"
)
{
...
...
ci/jenkins/step/singleDevTest.groovy
浏览文件 @
43fa6db9
...
...
@@ -14,7 +14,7 @@ timeout(time: 60, unit: 'MINUTES') {
// }
// dir ("milvus-helm") {
// dir ("milvus") {
// sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/mysql_${
env.
BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
// sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/mysql_${BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
// }
// }
// dir ("tests/milvus_python_test") {
...
...
ci/scripts/check_ccache.sh
浏览文件 @
43fa6db9
#!/bin/bash
OS_NAME
=
"linux"
CODE_NAME
=
$(
lsb_release
-sc
)
OS_NAME
=
"
${
OS_NAME
}
"
BUILD_ENV_DOCKER_IMAGE_ID
=
"
${
BUILD_ENV_IMAGE_ID
}
"
BRANCH_NAMES
=
$(
git log
--decorate
|
head
-n
1 |
sed
's/.*(\(.*\))/\1/'
|
sed
's=[a-zA-Z]*\/==g'
|
awk
-F
", "
'{$1=""; print $0}'
)
ARTIFACTORY_URL
=
""
...
...
@@ -43,13 +42,14 @@ fi
check_ccache
()
{
BRANCH
=
$1
echo
"fetching
${
BRANCH
}
/ccache-
${
OS_NAME
}
-
${
CODE_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz"
wget
-q
--method
HEAD
"
${
ARTIFACTORY_URL
}
/
${
BRANCH
}
/ccache-
${
OS_NAME
}
-
${
CODE_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz"
PACKAGE_FILE
=
"ccache-
${
OS_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz"
echo
"fetching
${
BRANCH
}
/
${
PACKAGE_FILE
}
"
wget
-q
--method
HEAD
"
${
ARTIFACTORY_URL
}
/
${
BRANCH
}
/
${
PACKAGE_FILE
}
"
if
[[
$?
==
0
]]
;
then
wget
-q
"
${
ARTIFACTORY_URL
}
/
${
BRANCH
}
/
ccache-
${
OS_NAME
}
-
${
CODE_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz
"
&&
\
wget
-q
"
${
ARTIFACTORY_URL
}
/
${
BRANCH
}
/
${
PACKAGE_FILE
}
"
&&
\
mkdir
-p
${
CCACHE_DIRECTORY
}
&&
\
tar
zxf
ccache-
${
OS_NAME
}
-
${
CODE_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz
-C
${
CCACHE_DIRECTORY
}
&&
\
rm
ccache-
${
OS_NAME
}
-
${
CODE_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz
tar
zxf
${
PACKAGE_FILE
}
-C
${
CCACHE_DIRECTORY
}
&&
\
rm
${
PACKAGE_FILE
}
if
[[
$?
==
0
]]
;
then
echo
"found cache"
exit
0
...
...
ci/scripts/coverage.sh
浏览文件 @
43fa6db9
...
...
@@ -13,10 +13,11 @@ MILVUS_CORE_DIR="${SCRIPTS_DIR}/../../core"
CORE_BUILD_DIR
=
"
${
MILVUS_CORE_DIR
}
/cmake_build"
MYSQL_USER_NAME
=
root
MYSQL_PASSWORD
=
123456
MYSQL_HOST
=
'127.0.0.1'
MYSQL_PORT
=
'3306'
MYSQL_HOST
=
"127.0.0.1"
MYSQL_PORT
=
"3306"
CODECOV_TOKEN
=
""
while
getopts
"o:b:u:p:t:h"
arg
while
getopts
"o:b:u:p:t:
c:
h"
arg
do
case
$arg
in
o
)
...
...
@@ -34,6 +35,9 @@ do
t
)
MYSQL_HOST
=
$OPTARG
;;
c
)
CODECOV_TOKEN
=
$OPTARG
;;
h
)
# help
echo
"
...
...
@@ -43,10 +47,11 @@ parameter:
-u: mysql account
-p: mysql password
-t: mysql host
-c: codecov token
-h: help
usage:
./coverage.sh -o
\$
{INSTALL_PREFIX} -b
\$
{CORE_BUILD_DIR} -u
\$
{MYSQL_USER} -p
\$
{MYSQL_PASSWORD} -t
\$
{MYSQL_HOST} [-h]
./coverage.sh -o
\$
{INSTALL_PREFIX} -b
\$
{CORE_BUILD_DIR} -u
\$
{MYSQL_USER} -p
\$
{MYSQL_PASSWORD} -t
\$
{MYSQL_HOST}
-c
\$
{CODECOV_TOKEN}
[-h]
"
exit
0
;;
...
...
@@ -146,5 +151,7 @@ if [ $? -ne 0 ]; then
exit
2
fi
# gen html report
# ${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/
if
[[
!
-z
${
CODECOV_TOKEN
}
]]
;
then
export
CODECOV_TOKEN
=
"
${
CODECOV_TOKEN
}
"
curl
-s
https://codecov.io/bash | bash
-s
-
-f
output_new.info
||
echo
"Codecov did not collect coverage reports"
fi
ci/scripts/update_ccache.sh
浏览文件 @
43fa6db9
#!/bin/bash
OS_NAME
=
"linux"
CODE_NAME
=
$(
lsb_release
-sc
)
OS_NAME
=
"
${
OS_NAME
}
"
BUILD_ENV_DOCKER_IMAGE_ID
=
"
${
BUILD_ENV_IMAGE_ID
}
"
BRANCH_NAME
=
$(
git log
--decorate
|
head
-n
1 |
sed
's/.*(\(.*\))/\1/'
|
sed
's/.*, //'
|
sed
's=[a-zA-Z]*\/==g'
)
ARTIFACTORY_URL
=
""
...
...
@@ -51,7 +50,7 @@ if [[ -z "${ARTIFACTORY_URL}" || "${ARTIFACTORY_URL}" == "" ]];then
exit
1
fi
PACKAGE_FILE
=
"ccache-
${
OS_NAME
}
-
${
CODE_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz"
PACKAGE_FILE
=
"ccache-
${
OS_NAME
}
-
${
BUILD_ENV_DOCKER_IMAGE_ID
}
.tar.gz"
REMOTE_PACKAGE_PATH
=
"
${
ARTIFACTORY_URL
}
/
${
BRANCH_NAME
}
"
ccache
--show-stats
...
...
core/cmake/ThirdPartyPackages.cmake
浏览文件 @
43fa6db9
...
...
@@ -331,7 +331,7 @@ if (DEFINED ENV{MILVUS_GRPC_URL})
set
(
GRPC_SOURCE_URL
"$ENV{MILVUS_GRPC_URL}"
)
else
()
set
(
GRPC_SOURCE_URL
"https://github.com/
youny626
/grpc-milvus/archive/
${
GRPC_VERSION
}
.zip"
)
"https://github.com/
ZhifengZhang-CN
/grpc-milvus/archive/
${
GRPC_VERSION
}
.zip"
)
endif
()
set
(
GRPC_MD5
"0362ba219f59432c530070b5f5c3df73"
)
...
...
docker-compose.yml
浏览文件 @
43fa6db9
...
...
@@ -59,9 +59,7 @@ services:
networks
:
-
milvus
command
:
¢os-command
>
/bin/bash -c "
source scl_source enable devtoolset-7
source scl_source enable llvm-toolset-7.0
/bin/bash --login -c "
/milvus/ci/scripts/build.sh -t Release -o ${MILVUS_INSTALL_PREFIX} -l -u -c
/milvus/ci/scripts/coverage.sh -o ${MILVUS_INSTALL_PREFIX} -u root -p 123456 -t mysql"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录