Commit bddc4d04 authored Oct 15, 2019 by jinhai

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

Update CI files

See merge request megasearch/milvus!744

Former-commit-id: ed4177d17ca3fbb4294bfbd1414b98b54d6d3f6e

parents 46ec1fb2 180b5d80

ci/jenkinsfile/milvus_build.groovy

+0 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@ container('milvus-build-env') {
		&& export JFROG_USER_NAME='${USERNAME}' \
		&& export JFROG_PASSWORD='${PASSWORD}' \
		&& export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \
		&& export http_proxy=http://proxy.zilliz.tech:1087 \
		&& export https_proxy=http://proxy.zilliz.tech:1087 \
		&& ./build.sh -t ${params.BUILD_TYPE} -j -u -c"

		sh "./coverage.sh -u root -p Fantast1c -t 192.168.1.194"

ci/jenkinsfile/milvus_build_no_ut.groovy

+0 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@ container('milvus-build-env') {
		&& export JFROG_USER_NAME='${USERNAME}' \
		&& export JFROG_PASSWORD='${PASSWORD}' \
		&& export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \
		&& export http_proxy=http://proxy.zilliz.tech:1087 \
		&& export https_proxy=http://proxy.zilliz.tech:1087 \
		&& ./build.sh -t ${params.BUILD_TYPE} -j"
		sh "./coverage.sh -u root -p Fantast1c -t 192.168.1.194"
		}

core/CHANGELOG.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,13 +43,13 @@ Please mark all change in change log and use the ticket from JIRA.
		- MS-608 - Update TODO names
		- MS-609 - Update task construct function
		- MS-611 - Add resources validity check in ResourceMgr
		- MS-614 - Preload table at startup
		- MS-619 - Add optimizer class in scheduler
		- MS-626 - Refactor DataObj to support cache any type data
		- MS-648 - Improve unittest
		- MS-655 - Upgrade SPTAG

		## New Feature
		- MS-614 - Preload table at startup
		- MS-627 - Integrate new index: IVFSQHybrid
		- MS-631 - IVFSQ8H Index support
		- MS-636 - Add optimizer in scheduler for FAISS_IVFSQ8H

core/cmake/ThirdPartyPackages.cmake

+2 −1

Original line number	Diff line number	Diff line
		@@ -268,7 +268,8 @@ if(DEFINED ENV{MILVUS_BOOST_URL})
		else()
		string(REPLACE "." "_" BOOST_VERSION_UNDERSCORES ${BOOST_VERSION})
		set(BOOST_SOURCE_URL
		"https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORES}.tar.gz")
		"https://nchc.dl.sourceforge.net/project/boost/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_UNDERSCORES}.tar.gz")
		#"https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORES}.tar.gz")
		endif()
		set(BOOST_MD5 "fea771fe8176828fabf9c09242ee8c26")