diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index cd3ab3753486c946eae472fb618c2f5da833892b..7749966f944fa4a9d8d6ab79372ec3d1584ca4aa 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -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 '' | 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 '' | 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' diff --git a/.jenkins/modules/Unittest/Unittest.groovy b/.jenkins/modules/Unittest/Unittest.groovy index 5e59378a8151ff9b7035300b62bb591337b51dc5..ec06a15757d6b1d70db56c9071c8d4a16ed9546d 100644 --- a/.jenkins/modules/Unittest/Unittest.groovy +++ b/.jenkins/modules/Unittest/Unittest.groovy @@ -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}" } } diff --git a/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml b/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml index 75114694e12a2bc77b8c85abafa9b7f2fa052953..eaaadf1e9a162e878341b01c00970a3677c8ed30 100644 --- a/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml +++ b/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml @@ -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 diff --git a/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml b/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml index 9b69d4c3e68449370cee0b25b2456a6702464293..20a5c01a6497fb3d119689c02e0a631c2266da23 100644 --- a/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml +++ b/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml @@ -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 diff --git a/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml b/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml index ca01ab34593a04319e4ca166def36ab89d86c1ae..b877c34560fc93b58c5165c9908ed87b8cc32ec1 100644 --- a/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml +++ b/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml @@ -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 diff --git a/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml b/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml index 0de67a77d0fa04eec3f5ed1a84820e6d637f5250..eeaf70255df5e0f3a0ffbeb0cb3656f443ee17ef 100644 --- a/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml +++ b/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml @@ -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 diff --git a/ci/scripts/coverage.sh b/ci/scripts/coverage.sh index 8bb729a68818fac03833efaef704ef215b05344e..cfde084c44a3e41514ced371ce75498eff705442 100755 --- a/ci/scripts/coverage.sh +++ b/ci/scripts/coverage.sh @@ -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 diff --git a/ci/scripts/run_unittest.sh b/ci/scripts/run_unittest.sh index 658b283a048dcb8fbdcf9cf73fd4be9c211daee5..387e00c2d6555472788c3f359f3e7315386e44d0 100755 --- a/ci/scripts/run_unittest.sh +++ b/ci/scripts/run_unittest.sh @@ -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 \ No newline at end of file +popd diff --git a/core/coverage.sh b/core/coverage.sh index 833b1b0050143e2b2aeddf4507c07a1b57f4b4f3..b09369fde4e03ede9c177e6faab860198d272697 100755 --- a/core/coverage.sh +++ b/core/coverage.sh @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index a27c8e5504c3bd71ec636938d261a8cf7d13e824..be40b4d0989a27d49e1db1369c90db03c6f3d2b9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: ¢os-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: