Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
079c80fd
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
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,发现更多精彩内容 >>
提交
079c80fd
编写于
9月 25, 2019
作者:
Q
quicksilver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format CMakeLists.txt
Former-commit-id: 51edf28f6d25998046cb2eb7e23aa4dd0b819cc0
上级
294ebb18
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
26 addition
and
17 deletion
+26
-17
ci/jenkinsfile/cluster_deploy2dev.groovy
ci/jenkinsfile/cluster_deploy2dev.groovy
+1
-1
ci/jenkinsfile/deploy2dev.groovy
ci/jenkinsfile/deploy2dev.groovy
+1
-1
ci/jenkinsfile/deploy2staging.groovy
ci/jenkinsfile/deploy2staging.groovy
+1
-1
ci/jenkinsfile/dev_test.groovy
ci/jenkinsfile/dev_test.groovy
+1
-1
ci/jenkinsfile/staging_test.groovy
ci/jenkinsfile/staging_test.groovy
+1
-1
cpp/CMakeLists.txt
cpp/CMakeLists.txt
+1
-1
cpp/cmake/ThirdPartyPackages.cmake
cpp/cmake/ThirdPartyPackages.cmake
+20
-11
未找到文件。
ci/jenkinsfile/cluster_deploy2dev.groovy
浏览文件 @
079c80fd
...
...
@@ -5,7 +5,7 @@ try {
dir
(
"milvus-helm"
)
{
checkout
([
$class
:
'GitSCM'
,
branches:
[[
name:
"${SEMVER}"
]],
doGenerateSubmoduleConfigurations:
false
,
extensions:
[],
submoduleCfg:
[],
userRemoteConfigs:
[[
credentialsId:
"${params.GIT_USER}"
,
url:
"git@192.168.1.105:megasearch/milvus-helm.git"
,
name:
'origin'
,
refspec:
"+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"
]]])
dir
(
"milvus/milvus-cluster"
)
{
sh
"helm install --wait --timeout 300 --set roServers.image.tag=${DOCKER_VERSION} --set woServers.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP -f ci/values.yaml --name ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster --namespace milvus-cluster --version 0.
4
.0 . "
sh
"helm install --wait --timeout 300 --set roServers.image.tag=${DOCKER_VERSION} --set woServers.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP -f ci/values.yaml --name ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster --namespace milvus-cluster --version 0.
5
.0 . "
}
}
/*
...
...
ci/jenkinsfile/deploy2dev.groovy
浏览文件 @
079c80fd
...
...
@@ -5,7 +5,7 @@ try {
dir
(
"milvus-helm"
)
{
checkout
([
$class
:
'GitSCM'
,
branches:
[[
name:
"${SEMVER}"
]],
doGenerateSubmoduleConfigurations:
false
,
extensions:
[],
submoduleCfg:
[],
userRemoteConfigs:
[[
credentialsId:
"${params.GIT_USER}"
,
url:
"git@192.168.1.105:megasearch/milvus-helm.git"
,
name:
'origin'
,
refspec:
"+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"
]]])
dir
(
"milvus/milvus-gpu"
)
{
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/values.yaml --namespace milvus-1 --version 0.
4
.0 ."
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/values.yaml --namespace milvus-1 --version 0.
5
.0 ."
}
}
}
catch
(
exc
)
{
...
...
ci/jenkinsfile/deploy2staging.groovy
浏览文件 @
079c80fd
...
...
@@ -5,7 +5,7 @@ try {
dir
(
"milvus-helm"
)
{
checkout
([
$class
:
'GitSCM'
,
branches:
[[
name:
"${SEMVER}"
]],
doGenerateSubmoduleConfigurations:
false
,
extensions:
[],
submoduleCfg:
[],
userRemoteConfigs:
[[
credentialsId:
"${params.GIT_USER}"
,
url:
"git@192.168.1.105:megasearch/milvus-helm.git"
,
name:
'origin'
,
refspec:
"+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"
]]])
dir
(
"milvus/milvus-gpu"
)
{
sh
"helm install --wait --timeout 300 --set engine.image.repository=\"zilliz.azurecr.cn/milvus/engine\" --set engine.image.tag=${DOCKER_VERSION} --set expose.type=loadBalancer --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/values.yaml --namespace milvus-1 --version 0.
4
.0 ."
sh
"helm install --wait --timeout 300 --set engine.image.repository=\"zilliz.azurecr.cn/milvus/engine\" --set engine.image.tag=${DOCKER_VERSION} --set expose.type=loadBalancer --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/values.yaml --namespace milvus-1 --version 0.
5
.0 ."
}
}
}
catch
(
exc
)
{
...
...
ci/jenkinsfile/dev_test.groovy
浏览文件 @
079c80fd
...
...
@@ -16,7 +16,7 @@ timeout(time: 30, unit: 'MINUTES') {
}
dir
(
"milvus-helm"
)
{
dir
(
"milvus/milvus-gpu"
)
{
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/db_backend/mysql_values.yaml --namespace milvus-2 --version 0.
4
.0 ."
sh
"helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/db_backend/mysql_values.yaml --namespace milvus-2 --version 0.
5
.0 ."
}
}
dir
(
"${PROJECT_NAME}_test"
)
{
...
...
ci/jenkinsfile/staging_test.groovy
浏览文件 @
079c80fd
...
...
@@ -17,7 +17,7 @@ timeout(time: 40, unit: 'MINUTES') {
}
dir
(
"milvus-helm"
)
{
dir
(
"milvus/milvus-gpu"
)
{
sh
"helm install --wait --timeout 300 --set engine.image.repository=\"zilliz.azurecr.cn/milvus/engine\" --set engine.image.tag=${DOCKER_VERSION} --set expose.type=loadBalancer --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/db_backend/mysql_values.yaml --namespace milvus-2 --version 0.
4
.0 ."
sh
"helm install --wait --timeout 300 --set engine.image.repository=\"zilliz.azurecr.cn/milvus/engine\" --set engine.image.tag=${DOCKER_VERSION} --set expose.type=loadBalancer --name ${env.JOB_NAME}-${env.BUILD_NUMBER} -f ci/db_backend/mysql_values.yaml --namespace milvus-2 --version 0.
5
.0 ."
}
}
dir
(
"${PROJECT_NAME}_test"
)
{
...
...
cpp/CMakeLists.txt
浏览文件 @
079c80fd
...
...
@@ -71,7 +71,7 @@ if(MILVUS_VERSION_MAJOR STREQUAL ""
OR MILVUS_VERSION_MINOR STREQUAL
""
OR MILVUS_VERSION_PATCH STREQUAL
""
)
message
(
WARNING
"Failed to determine Milvus version from git branch name"
)
set
(
MILVUS_VERSION
"0.
4
.0"
)
set
(
MILVUS_VERSION
"0.
5
.0"
)
endif
()
message
(
STATUS
"Build version =
${
MILVUS_VERSION
}
"
)
...
...
cpp/cmake/ThirdPartyPackages.cmake
浏览文件 @
079c80fd
...
...
@@ -137,9 +137,26 @@ if(NOT DEFINED USE_JFROG_CACHE)
set
(
USE_JFROG_CACHE
"OFF"
)
endif
()
if
(
USE_JFROG_CACHE STREQUAL
"ON"
)
set
(
JFROG_ARTFACTORY_CACHE_URL
"http://192.168.1.201:80/artifactory/generic-local/milvus/thirdparty/cache/
${
CMAKE_OS_NAME
}
/
${
MILVUS_BUILD_ARCH
}
/
${
BUILD_TYPE
}
"
)
set
(
JFROG_USER_NAME
"test"
)
set
(
JFROG_PASSWORD
"Fantast1c"
)
if
(
DEFINED ENV{JFROG_ARTFACTORY_URL}
)
set
(
JFROG_ARTFACTORY_URL
"$ENV{JFROG_ARTFACTORY_URL}"
)
endif
()
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
}
"
)
if
(
DEFINED ENV{JFROG_USER_NAME}
)
set
(
JFROG_USER_NAME
"$ENV{JFROG_USER_NAME}"
)
endif
()
if
(
NOT DEFINED JFROG_USER_NAME
)
message
(
FATAL_ERROR
"JFROG_USER_NAME is not set"
)
endif
()
if
(
DEFINED ENV{JFROG_PASSWORD}
)
set
(
JFROG_PASSWORD
"$ENV{JFROG_PASSWORD}"
)
endif
()
if
(
NOT DEFINED JFROG_PASSWORD
)
message
(
FATAL_ERROR
"JFROG_PASSWORD is not set"
)
endif
()
set
(
THIRDPARTY_PACKAGE_CACHE
"
${
THIRDPARTY_DIR
}
/cache"
)
endif
()
...
...
@@ -242,14 +259,6 @@ foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT})
set
(
${
_LIB_NAME
}
"
${
_LIB_VERSION
}
"
)
endforeach
()
if
(
DEFINED ENV{MILVUS_ARROW_URL}
)
set
(
ARROW_SOURCE_URL
"$ENV{MILVUS_ARROW_URL}"
)
else
()
set
(
ARROW_SOURCE_URL
"https://github.com/youny626/arrow.git"
)
endif
()
if
(
DEFINED ENV{MILVUS_BOOST_URL}
)
set
(
BOOST_SOURCE_URL
"$ENV{MILVUS_BOOST_URL}"
)
else
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录