Skip to content

milvus
milvus

BaiXuePrincess / milvus
与 Fork 源项目一致

Fork自 milvus / milvus

通知 7
Star 4
Fork 0
milvus
milvus

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 335f35ed 编写于 作者: W wxyu
浏览文件
操作

Merge remote-tracking branch 'main/0.5.1' into dev 


Former-commit-id: a7bbf065776bbbc14c824880fdea706a66fdec93
上级 4df6f4b5 434548fa
展开全部 隐藏空白更改
内联 并排
Showing with 311 addition and 353 deletion
ci/jenkins/Jenkinsfile
浏览文件 @ 335f35ed
#!/usr/bin/env groovy
String cron_timezone = "TZ=Asia/Shanghai" String cron_timezone = "TZ=Asia/Shanghai"
String cron_string = BRANCH_NAME == "master" ? "H 0 * * * " : "" String cron_string = BRANCH_NAME == "master" ? "H 0 * * * " : ""
cron_string = BRANCH_NAME == "0.5.1" ? "H 1 * * * " : cron_string cron_string = BRANCH_NAME == "0.5.1" ? "H 1 * * * " : cron_string
...@@ -16,7 +18,6 @@ pipeline { ...@@ -16,7 +18,6 @@ pipeline {
parameters{ parameters{
choice choices: ['Release', 'Debug'], description: '', name: 'BUILD_TYPE' choice choices: ['Release', 'Debug'], description: '', name: 'BUILD_TYPE'
string defaultValue: 'cf1434e7-5a4b-4d25-82e8-88d667aef9e5', description: 'GIT CREDENTIALS ID', name: 'GIT_CREDENTIALS_ID', trim: true
string defaultValue: 'registry.zilliz.com', description: 'DOCKER REGISTRY URL', name: 'DOKCER_REGISTRY_URL', trim: true string defaultValue: 'registry.zilliz.com', description: 'DOCKER REGISTRY URL', name: 'DOKCER_REGISTRY_URL', trim: true
string defaultValue: 'ba070c98-c8cc-4f7c-b657-897715f359fc', description: 'DOCKER CREDENTIALS ID', name: 'DOCKER_CREDENTIALS_ID', trim: true string defaultValue: 'ba070c98-c8cc-4f7c-b657-897715f359fc', description: 'DOCKER CREDENTIALS ID', name: 'DOCKER_CREDENTIALS_ID', trim: true
string defaultValue: 'http://192.168.1.202/artifactory/milvus', description: 'JFROG ARTFACTORY URL', name: 'JFROG_ARTFACTORY_URL', trim: true string defaultValue: 'http://192.168.1.202/artifactory/milvus', description: 'JFROG ARTFACTORY URL', name: 'JFROG_ARTFACTORY_URL', trim: true
...@@ -56,7 +57,7 @@ pipeline { ...@@ -56,7 +57,7 @@ pipeline {
steps { steps {
container('milvus-build-env') { container('milvus-build-env') {
script { script {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/build.groovy" load "${env.WORKSPACE}/ci/jenkins/step/build.groovy"
} }
} }
} }
...@@ -65,7 +66,7 @@ pipeline { ...@@ -65,7 +66,7 @@ pipeline {
steps { steps {
container('milvus-build-env') { container('milvus-build-env') {
script { script {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/coverage.groovy" load "${env.WORKSPACE}/ci/jenkins/step/coverage.groovy"
} }
} }
} }
...@@ -74,7 +75,7 @@ pipeline { ...@@ -74,7 +75,7 @@ pipeline {
steps { steps {
container('milvus-build-env') { container('milvus-build-env') {
script { script {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/package.groovy" load "${env.WORKSPACE}/ci/jenkins/step/package.groovy"
} }
} }
} }
...@@ -96,7 +97,7 @@ pipeline { ...@@ -96,7 +97,7 @@ pipeline {
steps { steps {
container('publish-images'){ container('publish-images'){
script { script {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/publishImages.groovy" load "${env.WORKSPACE}/ci/jenkins/step/publishImages.groovy"
} }
} }
} }
...@@ -118,7 +119,7 @@ pipeline { ...@@ -118,7 +119,7 @@ pipeline {
steps { steps {
container('milvus-test-env') { container('milvus-test-env') {
script { script {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/deploySingle2Dev.groovy" load "${env.WORKSPACE}/ci/jenkins/step/deploySingle2Dev.groovy"
} }
} }
} }
...@@ -130,9 +131,9 @@ pipeline { ...@@ -130,9 +131,9 @@ pipeline {
script { script {
boolean isNightlyTest = isTimeTriggeredBuild() boolean isNightlyTest = isTimeTriggeredBuild()
if (isNightlyTest) { if (isNightlyTest) {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/singleDevNightlyTest.groovy" load "${env.WORKSPACE}/ci/jenkins/step/singleDevNightlyTest.groovy"
} else { } else {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/singleDevTest.groovy" load "${env.WORKSPACE}/ci/jenkins/step/singleDevTest.groovy"
} }
} }
} }
...@@ -143,7 +144,7 @@ pipeline { ...@@ -143,7 +144,7 @@ pipeline {
steps { steps {
container('milvus-test-env') { container('milvus-test-env') {
script { script {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/cleanupSingleDev.groovy" load "${env.WORKSPACE}/ci/jenkins/step/cleanupSingleDev.groovy"
} }
} }
} }
...@@ -153,7 +154,7 @@ pipeline { ...@@ -153,7 +154,7 @@ pipeline {
unsuccessful { unsuccessful {
container('milvus-test-env') { container('milvus-test-env') {
script { script {
load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/cleanupSingleDev.groovy" load "${env.WORKSPACE}/ci/jenkins/step/cleanupSingleDev.groovy"
} }
} }
} }
......
ci/jenkins/jenkinsfile/deploySingle2Dev.groovy → ci/jenkins/step/deploySingle2Dev.groovy
浏览文件 @ 335f35ed
sh 'helm init --client-only --skip-refresh --stable-repo-url https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts' sh 'helm init --client-only --skip-refresh --stable-repo-url https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts'
sh 'helm repo update' sh 'helm repo update'
dir ('milvus-helm') { dir ('milvus-helm') {
checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]]) checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])
dir ("milvus-gpu") { dir ("milvus-gpu") {
sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/db_backend/sqlite_values.yaml -f ci/filebeat/values.yaml --namespace milvus ." sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/db_backend/sqlite_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
} }
......
ci/jenkins/jenkinsfile/singleDevNightlyTest.groovy → ci/jenkins/step/singleDevNightlyTest.groovy
浏览文件 @ 335f35ed
...@@ -8,7 +8,7 @@ timeout(time: 90, unit: 'MINUTES') { ...@@ -8,7 +8,7 @@ timeout(time: 90, unit: 'MINUTES') {
if (!fileExists('milvus-helm')) { if (!fileExists('milvus-helm')) {
dir ("milvus-helm") { dir ("milvus-helm") {
checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]]) checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])
} }
} }
dir ("milvus-helm") { dir ("milvus-helm") {
......
ci/jenkins/jenkinsfile/singleDevTest.groovy → ci/jenkins/step/singleDevTest.groovy
浏览文件 @ 335f35ed
...@@ -10,7 +10,7 @@ timeout(time: 60, unit: 'MINUTES') { ...@@ -10,7 +10,7 @@ timeout(time: 60, unit: 'MINUTES') {
// if (!fileExists('milvus-helm')) { // if (!fileExists('milvus-helm')) {
// dir ("milvus-helm") { // dir ("milvus-helm") {
// checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]]) // checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])
// } // }
// } // }
// dir ("milvus-helm") { // dir ("milvus-helm") {
......
core/cmake/ThirdPartyPackages.cmake
浏览文件 @ 335f35ed
...@@ -114,7 +114,7 @@ if (UNIX) ...@@ -114,7 +114,7 @@ if (UNIX)
OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
STRING(REGEX REPLACE "\\." "_" UBUNTU_VERSION ${LSB_RELEASE_ID_SHORT}) STRING(REGEX REPLACE "\\." "_" UBUNTU_VERSION "${LSB_RELEASE_ID_SHORT}")
endif (UBUNTU_FOUND) endif (UBUNTU_FOUND)
endif (UBUNTU_EXTRA) endif (UBUNTU_EXTRA)
endif (DEBIAN_FOUND) endif (DEBIAN_FOUND)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或