milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update coverity.sh () 

* update coverity.sh

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>

* Modify CI workflow ()

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>

Co-authored-by: quicksilver <zhifeng.zhang@zilliz.com>
pull/3458/head
Cai Yudong 2020-08-26 11:01:03 +08:00 committed by GitHub
parent 68e8d68a7e
commit 1590b105f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 9 additions and 209 deletions

4
.github/workflows/core.yml vendored
View File

@ -44,7 +44,6 @@ jobs:
- name: Docker Pull
shell: bash
run: |
docker-compose pull --ignore-pull-failures db
docker-compose pull --ignore-pull-failures ubuntu-core
- name: Docker Build
shell: bash
@ -53,7 +52,6 @@ jobs:
docker rmi $(docker images | grep '<none>' | awk '{print $3}') || exit 0
- name: Docker Run
run: |
docker-compose run --use-aliases -d db
docker-compose run ubuntu-core
- name: Docker Push
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus'
@ -92,7 +90,6 @@ jobs:
- name: Docker Pull
shell: bash
run: |
docker-compose pull --ignore-pull-failures db
docker-compose pull --ignore-pull-failures centos-core
- name: Docker Build
shell: bash
@ -101,7 +98,6 @@ jobs:
docker rmi $(docker images | grep '<none>' | awk '{print $3}') || exit 0
- name: Docker Run
run: |
docker-compose run --use-aliases -d db
docker-compose run centos-core
- name: Docker Push
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus'

2
.jenkins/modules/Unittest/Unittest.groovy
View File

@ -1,5 +1,5 @@
timeout(time: 30, unit: 'MINUTES') {
dir ("ci/scripts") {
sh "./run_unittest.sh -i ${env.MILVUS_INSTALL_PREFIX} --mysql_user=root --mysql_password=123456 --mysql_host=\"127.0.0.1\""
sh "./run_unittest.sh -i ${env.MILVUS_INSTALL_PREFIX}"
}
}

15
ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml
View File

@ -28,21 +28,6 @@ spec:
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
resources:
limits:
memory: "500Mi"
cpu: "0.5"
requests:
memory: "200Mi"
cpu: "0.2"
tolerations:
- key: dedicated
operator: Equal

15
ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml
View File

@ -28,21 +28,6 @@ spec:
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
resources:
limits:
memory: "500Mi"
cpu: "0.5"
requests:
memory: "200Mi"
cpu: "0.2"
tolerations:
- key: dedicated
operator: Equal

15
ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml
View File

@ -30,21 +30,6 @@ spec:
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
resources:
limits:
memory: "500Mi"
cpu: "0.5"
requests:
memory: "200Mi"
cpu: "0.2"
tolerations:
- key: dedicated
operator: Equal

15
ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml
View File

@ -30,21 +30,6 @@ spec:
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
resources:
limits:
memory: "500Mi"
cpu: "0.5"
requests:
memory: "200Mi"
cpu: "0.2"
tolerations:
- key: dedicated
operator: Equal

8
ci/scripts/coverage.sh
View File

@ -88,15 +88,9 @@ ${LCOV_CMD} -a ${FILE_INFO_BASE} -a ${FILE_INFO_MILVUS} -o "${FILE_INFO_OUTPUT}"
# remove third party from tracefiles
${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
"/usr/*" \
"*/boost/*" \
"*/cmake_build/*_ep-prefix/*" \
"*/src/index/cmake_build*" \
"*/cmake_build/*" \
"*/src/index/thirdparty*" \
"*/src/grpc*" \
"*/src/metrics/MetricBase.h" \
"*/src/server/Server.cpp" \
"*/src/server/DBWrapper.cpp" \
"*/src/server/grpc_impl/GrpcServer.cpp" \
"*/thirdparty/*"
if [ $? -ne 0 ]; then

57
ci/scripts/run_unittest.sh
View File

@ -16,17 +16,13 @@ Usage:
-i [INSTALL_PREFIX] or --install_prefix=[INSTALL_PREFIX]
Install directory used by install.
--mysql_user=[MYSQL_USER_NAME] MySQL User Name
--mysql_password=[MYSQL_PASSWORD]
MySQL Password
--mysql_host=[MYSQL_HOST] MySQL Host
-h or --help Print help information
Use \"$0 --help\" for more information about a given command.
"
ARGS=`getopt -o "i:h" -l "install_prefix::,mysql_user::,mysql_password::,mysql_host::,help" -n "$0" -- "$@"`
ARGS=`getopt -o "i:h" -l "install_prefix::,help" -n "$0" -- "$@"`
eval set -- "${ARGS}"
@ -40,21 +36,6 @@ while true ; do
"") echo "Option install_prefix, no argument"; exit 1 ;;
*) INSTALL_PREFIX=$2 ; shift 2 ;;
esac ;;
--mysql_user)
case "$2" in
"") echo "Option mysql_user, no argument"; exit 1 ;;
*) MYSQL_USER_NAME=$2 ; shift 2 ;;
esac ;;
--mysql_password)
case "$2" in
"") echo "Option mysql_password, no argument"; exit 1 ;;
*) MYSQL_PASSWORD=$2 ; shift 2 ;;
esac ;;
--mysql_host)
case "$2" in
"") echo "Option mysql_host, no argument"; exit 1 ;;
*) MYSQL_HOST=$2 ; shift 2 ;;
esac ;;
-h|--help) echo -e "${HELP}" ; exit 0 ;;
--) shift ; break ;;
*) echo "Internal error!" ; exit 1 ;;
@ -63,10 +44,6 @@ done
# Set defaults for vars modified by flags to this script
INSTALL_PREFIX=${INSTALL_PREFIX:="/var/lib/milvus"}
MYSQL_USER_NAME=${MYSQL_USER_NAME:="root"}
MYSQL_PASSWORD=${MYSQL_PASSWORD:="123456"}
MYSQL_HOST=${MYSQL_HOST:="127.0.0.1"}
MYSQL_PORT=${MYSQL_PORT:="3306"}
DIR_UNITTEST="${INSTALL_PREFIX}/unittest"
if [ -d ${INSTALL_PREFIX}/lib ]; then
@ -80,42 +57,14 @@ fi
pushd ${SCRIPTS_DIR}
MYSQL_DB_NAME=milvus_`date +%s%N`
function mysql_exc()
{
cmd=$1
mysql -h${MYSQL_HOST} -u${MYSQL_USER_NAME} -p${MYSQL_PASSWORD} -e "${cmd}"
if [ $? -ne 0 ]; then
echo "mysql $cmd run failed"
fi
}
mysql_exc "CREATE DATABASE IF NOT EXISTS ${MYSQL_DB_NAME};"
mysql_exc "GRANT ALL PRIVILEGES ON ${MYSQL_DB_NAME}.* TO '${MYSQL_USER_NAME}'@'%';"
mysql_exc "FLUSH PRIVILEGES;"
mysql_exc "USE ${MYSQL_DB_NAME};"
for test in `ls ${DIR_UNITTEST}`; do
echo $test
case ${test} in
test_db)
# set run args for test_db
args="mysql://${MYSQL_USER_NAME}:${MYSQL_PASSWORD}@${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB_NAME}"
;;
*test_*)
args=""
;;
esac
# run unittest
${DIR_UNITTEST}/${test} "${args}"
${DIR_UNITTEST}/${test}
if [ $? -ne 0 ]; then
echo ${args}
echo ${DIR_UNITTEST}/${test} "run failed"
exit 1
fi
done
mysql_exc "DROP DATABASE IF EXISTS ${MYSQL_DB_NAME};"
popd
popd

72
core/coverage.sh
View File

@ -2,44 +2,6 @@
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/milvus/lib
MYSQL_USER_NAME=root
MYSQL_PASSWORD=123456
MYSQL_HOST='127.0.0.1'
MYSQL_PORT='3306'
while getopts "u:p:t:h" arg
do
case $arg in
u)
MYSQL_USER_NAME=$OPTARG
;;
p)
MYSQL_PASSWORD=$OPTARG
;;
t)
MYSQL_HOST=$OPTARG
;;
h) # help
echo "
parameter:
-u: mysql account
-p: mysql password
-t: mysql host
-h: help
usage:
./coverage.sh -u \${MYSQL_USER} -p \${MYSQL_PASSWORD} -t \${MYSQL_HOST} [-h]
"
exit 0
;;
?)
echo "ERROR! unknown argument"
exit 1
;;
esac
done
LCOV_CMD="lcov"
LCOV_GEN_CMD="genhtml"
@ -62,20 +24,6 @@ rm -f FILE_INFO_BASE FILE_INFO_MILVUS FILE_INFO_OUTPUT FILE_INFO_OUTPUT_NEW
MYSQL_DB_NAME=milvus_`date +%s%N`
function mysql_exc()
{
cmd=$1
mysql -h${MYSQL_HOST} -u${MYSQL_USER_NAME} -p${MYSQL_PASSWORD} -e "${cmd}"
if [ $? -ne 0 ]; then
echo "mysql $cmd run failed"
fi
}
mysql_exc "CREATE DATABASE IF NOT EXISTS ${MYSQL_DB_NAME};"
mysql_exc "GRANT ALL PRIVILEGES ON ${MYSQL_DB_NAME}.* TO '${MYSQL_USER_NAME}'@'%';"
mysql_exc "FLUSH PRIVILEGES;"
mysql_exc "USE ${MYSQL_DB_NAME};"
# get baseline
${LCOV_CMD} -c -i -d ${DIR_GCNO} -o "${FILE_INFO_BASE}"
if [ $? -ne 0 ]; then
@ -85,19 +33,9 @@ fi
for test in `ls ${DIR_UNITTEST}`; do
echo $test
case ${test} in
test_db)
# set run args for test_db
args="mysql://${MYSQL_USER_NAME}:${MYSQL_PASSWORD}@${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB_NAME}"
;;
*test_*)
args=""
;;
esac
# run unittest
./${DIR_UNITTEST}/${test} "${args}"
./${DIR_UNITTEST}/${test}
if [ $? -ne 0 ]; then
echo ${args}
echo ${DIR_UNITTEST}/${test} "run failed"
exit -1
fi
@ -113,15 +51,9 @@ ${LCOV_CMD} -a ${FILE_INFO_BASE} -a ${FILE_INFO_MILVUS} -o "${FILE_INFO_OUTPUT}"
# remove third party from tracefiles
${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
"/usr/*" \
"*/boost/*" \
"*/cmake_build/*_ep-prefix/*" \
"*/src/index/cmake_build*" \
"*/cmake_build/*" \
"*/src/index/thirdparty*" \
"*/src/grpc*" \
"*/src/metrics/MetricBase.h" \
"*/src/server/Server.cpp" \
"*/src/server/DBWrapper.cpp" \
"*/src/server/grpc_impl/GrpcServer.cpp" \
"*/thirdparty/*"
if [ $? -ne 0 ]; then

15
docker-compose.yml
View File

@ -14,17 +14,6 @@ x-ccache: &ccache
CCACHE_DIR: /build/ccache
services:
db:
image: mysql:5.6
ports:
- "3306:3306"
environment:
MYSQL_ROOT_PASSWORD: 123456
networks:
milvus:
aliases:
- "mysql"
ubuntu-core:
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-core
build:
@ -42,7 +31,7 @@ services:
- milvus
command: &ubuntu-command
["/milvus/ci/scripts/build.sh -t Release -j2 -i ${MILVUS_INSTALL_PREFIX} --with_fiu --coverage -u &&
/milvus/ci/scripts/run_unittest.sh -i ${MILVUS_INSTALL_PREFIX} --mysql_user=root --mysql_password=123456 --mysql_host=mysql &&
/milvus/ci/scripts/run_unittest.sh -i ${MILVUS_INSTALL_PREFIX} &&
/milvus/ci/scripts/coverage.sh"]
centos-core:
@ -62,7 +51,7 @@ services:
- milvus
command: &centos-command
["/milvus/ci/scripts/build.sh -t Release -j2 -i ${MILVUS_INSTALL_PREFIX} --with_fiu --coverage -u &&
/milvus/ci/scripts/run_unittest.sh -i ${MILVUS_INSTALL_PREFIX} --mysql_user=root --mysql_password=123456 --mysql_host=mysql &&
/milvus/ci/scripts/run_unittest.sh -i ${MILVUS_INSTALL_PREFIX} &&
/milvus/ci/scripts/coverage.sh"]
ubuntu-cuda-core: