milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance: hot fix publish pipeline (#32330) 

Signed-off-by: Liang Huang <sammy.huang@zilliz.com>
pull/32334/head
sammy.huang 2024-04-16 19:48:15 +08:00 committed by GitHub
parent 72c172a7d7
commit 15b9319523
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build_image_gpu.sh
View File

@ -24,7 +24,7 @@ set -x
# Absolute path to the toplevel milvus directory.
toplevel=$(dirname "$(cd "$(dirname "${0}")"; pwd)")
OS_NAME="${OS_NAME:-ubuntu20.04}"
OS_NAME="${OS_NAME:-ubuntu22.04}"
MILVUS_IMAGE_REPO="${MILVUS_IMAGE_REPO:-milvusdb/milvus}"
MILVUS_IMAGE_TAG="${MILVUS_IMAGE_TAG:-gpu-latest}"

4
build/builder_gpu.sh
View File

@ -9,7 +9,7 @@ if [[ "$IS_NETWORK_MODE_HOST" == "true" ]]; then
sed -i '/gpubuilder:/,/^\s*$/s/image: \${IMAGE_REPO}\/milvus-env:gpu-\${OS_NAME}-\${GPU_DATE_VERSION}/&\n network_mode: "host"/' $toplevel/docker-compose.yml
fi
export OS_NAME="${OS_NAME:-ubuntu20.04}"
export OS_NAME="${OS_NAME:-ubuntu22.04}"
pushd "${toplevel}"
@ -50,7 +50,7 @@ fi
if [[ "$(id -u)" != "0" ]]; then
docker-compose run --no-deps --rm -u "$uid:$gid" gpubuilder "$@"
else
docker-compose run --no-deps --rm --entrypoint "/tini -- /entrypoint.sh" gpubuilder "$@"
docker-compose run --no-deps --rm gpubuilder "$@"
fi
popd

2
ci/jenkins/PublishArmBasedGPUImages.groovy
View File

@ -30,7 +30,7 @@ pipeline {
. ${WORKSPACE}/.env
set +a # stop automatically
docker run -v \$(pwd):/root/milvus -v \$(pwd)/.docker/.conan:/root/.conan -w /root/milvus milvusdb/milvus-env:ubuntu22.04-\${GPU_DATE_VERSION} sh -c "make clean && make gpu-install"
docker run -v \$(pwd):/root/milvus -v \$(pwd)/.docker/.conan:/root/.conan -w /root/milvus milvusdb/milvus-env:gpu-ubuntu22.04-\${GPU_DATE_VERSION} sh -c "make clean && make gpu-install"
"""
def date = sh(returnStdout: true, script: 'date +%Y%m%d').trim()

2
ci/jenkins/PublishGPUImages.groovy
View File

@ -38,6 +38,7 @@ pipeline {
# disable dirty tag
sed -i. 's/--dirty="-dev"//g' Makefile
export IS_NETWORK_MODE_HOST="true"
export OS_NAME=ubuntu22.04
./build/builder_gpu.sh /bin/bash -c \"make gpu-install\"
"""
@ -51,6 +52,7 @@ pipeline {
export MILVUS_HARBOR_IMAGE_REPO="${env.HARBOR_REPO}/milvus/milvus"
export MILVUS_IMAGE_TAG="${env.BRANCH_NAME}-${date}-${gitShortCommit}-gpu"
export DOCKER_BUILDKIT=1
export OS_NAME=ubuntu22.04
build/build_image_gpu.sh
docker push \${MILVUS_IMAGE_REPO}:\${MILVUS_IMAGE_TAG}
docker tag \${MILVUS_IMAGE_REPO}:\${MILVUS_IMAGE_TAG} \${MILVUS_IMAGE_REPO}:${env.BRANCH_NAME}-latest-gpu