Commit 8dc37ec4 authored Oct 13, 2019 by jinhai

Merge branch 'branch-0.5.0' into 'branch-0.5.0'

# Conflicts:
#   cpp/src/core/unittest/test_ivf.cpp
#   cpp/unittest/scheduler/test_resource.cpp

Former-commit-id: 360845125a61fbb7033be1020a336ec31ce2a695

parents 70db1754 f604a61c

ci/jenkinsfile/dev_test.groovy

+1 −2

Original line number	Diff line number	Diff line
		@@ -2,10 +2,9 @@ timeout(time: 30, unit: 'MINUTES') {
		try {
		dir ("${PROJECT_NAME}_test") {
		checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:Test/milvus_test.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]])
		sh 'python3 -m pip install -r requirements.txt'
		sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'
		sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --level=1 --ip ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.milvus-1.svc.cluster.local"
		}

		// mysql database backend test
		load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"

ci/jenkinsfile/dev_test_all.groovy

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ timeout(time: 60, unit: 'MINUTES') {
		try {
		dir ("${PROJECT_NAME}_test") {
		checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:Test/milvus_test.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]])
		sh 'python3 -m pip install -r requirements.txt'
		sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'
		sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.milvus-1.svc.cluster.local"
		}

cpp/CHANGELOG.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ Please mark all change in change log and use the ticket from JIRA.
		- MS-619 - Add optimizer class in scheduler
		- MS-614 - Preload table at startup
		- MS-626 - Refactor DataObj to support cache any type data
		- MS-648 - Improve unittest

		## New Feature
		- MS-627 - Integrate new index: IVFSQHybrid

cpp/cmake/ThirdPartyPackages.cmake

+1 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ if(USE_JFROG_CACHE STREQUAL "ON")
		if(NOT DEFINED JFROG_ARTFACTORY_URL)
		message(FATAL_ERROR "JFROG_ARTFACTORY_URL is not set")
		endif()
		set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/generic-local/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")
		set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")
		if(DEFINED ENV{JFROG_USER_NAME})
		set(JFROG_USER_NAME "$ENV{JFROG_USER_NAME}")
		endif()

cpp/src/core/cmake/ThirdPartyPackagesCore.cmake

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ if(NOT DEFINED USE_JFROG_CACHE)
		set(USE_JFROG_CACHE "OFF")
		endif()
		if(USE_JFROG_CACHE STREQUAL "ON")
		set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/generic-local/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${KNOWHERE_BUILD_ARCH}/${BUILD_TYPE}")
		set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${KNOWHERE_BUILD_ARCH}/${BUILD_TYPE}")
		set(THIRDPARTY_PACKAGE_CACHE "${THIRDPARTY_DIR}/cache")
		endif()