From 15b93195232d5ce48ad01eb28b3d530ba55ab681 Mon Sep 17 00:00:00 2001
From: "sammy.huang" <sammy.huang@zilliz.com>
Date: Tue, 16 Apr 2024 19:48:15 +0800
Subject: [PATCH] enhance: hot fix publish pipeline (#32330)

Signed-off-by: Liang Huang <sammy.huang@zilliz.com>
---
 build/build_image_gpu.sh                   | 2 +-
 build/builder_gpu.sh                       | 4 ++--
 ci/jenkins/PublishArmBasedGPUImages.groovy | 2 +-
 ci/jenkins/PublishGPUImages.groovy         | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/build_image_gpu.sh b/build/build_image_gpu.sh
index a36f2619c8..d94700797f 100755
--- a/build/build_image_gpu.sh
+++ b/build/build_image_gpu.sh
@@ -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}"
 
diff --git a/build/builder_gpu.sh b/build/builder_gpu.sh
index e74ee1a912..8b3c6ba305 100755
--- a/build/builder_gpu.sh
+++ b/build/builder_gpu.sh
@@ -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
diff --git a/ci/jenkins/PublishArmBasedGPUImages.groovy b/ci/jenkins/PublishArmBasedGPUImages.groovy
index 2ad61a7eb3..3ed8affb07 100644
--- a/ci/jenkins/PublishArmBasedGPUImages.groovy
+++ b/ci/jenkins/PublishArmBasedGPUImages.groovy
@@ -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()
diff --git a/ci/jenkins/PublishGPUImages.groovy b/ci/jenkins/PublishGPUImages.groovy
index 3613b4d379..512ebdb3d0 100644
--- a/ci/jenkins/PublishGPUImages.groovy
+++ b/ci/jenkins/PublishGPUImages.groovy
@@ -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