Update gpu e2e (milvus-io#22933)

Signed-off-by: Bennu-Li <[email protected]>
jiaoew1991 · Mar 24, 2023 · 52f4de3 · 52f4de3
1 parent 306d29d
commit 52f4de3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/ci/jenkins/PRGPU.groovy b/ci/jenkins/PRGPU.groovy
@@ -125,6 +125,7 @@ pipeline {
                                                 --skip-test \
                                                 --skip-build \
                                                 --skip-build-image \
+                                                --gpu \
                                                 --install-extra-arg "
                                                 --set etcd.metrics.enabled=true \
                                                 --set etcd.metrics.podMonitor.enabled=true \
@@ -165,7 +166,7 @@ pipeline {
                                 }
                                 dir ('tests/scripts') {
                                     script {
-                                        def release_name=sh(returnStdout: true, script: './get_release_name.sh')
+                                        def release_name=sh(returnStdout: true, script: 'MODE=\"gpu\" ./get_release_name.sh')
                                         def clusterEnabled = 'false'
                                         if ("${MILVUS_SERVER_TYPE}" == "distributed") {
                                             clusterEnabled = "true"
@@ -203,7 +204,7 @@ pipeline {
                         container('main') {
                             dir ('tests/scripts') {  
                                 script {
-                                    def release_name=sh(returnStdout: true, script: './get_release_name.sh')
+                                    def release_name=sh(returnStdout: true, script: 'MODE=\"gpu\" ./get_release_name.sh')
                                     sh "kubectl get pods -n ${MILVUS_HELM_NAMESPACE} | grep ${release_name} "
                                     sh "./uninstall_milvus.sh --release-name ${release_name}"
                                     sh "./ci_logs.sh --log-dir /ci-logs  --artifacts-name ${env.ARTIFACTS}/artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-${MILVUS_CLIENT}-e2e-logs \
@@ -235,5 +236,5 @@ pipeline {
     //                 }
     //             }
     //         }
-    //     }
+    // }
 }
diff --git a/tests/scripts/e2e-k8s.sh b/tests/scripts/e2e-k8s.sh
@@ -207,11 +207,13 @@ if [[ -n "${GPU_BUILD:-}" ]]; then
   export BUILD_SCRIPT="builder_gpu.sh"
   export BUILD_IMAGE_SCRIPT="build_image_gpu.sh"
   export TAG="${TAG:-gpu-latest}"
+  export MODE="gpu"
 else
   export BUILD_COMMAND="${BUILD_COMMAND:-make install}"
   export BUILD_SCRIPT="builder.sh"
   export BUILD_IMAGE_SCRIPT="build_image.sh"
   export TAG="${TAG:-latest}"
+  export MODE="cpu"
 fi
 
 export MANUAL="${MANUAL:-}"

diff --git a/tests/scripts/get_release_name.sh b/tests/scripts/get_release_name.sh
@@ -60,6 +60,10 @@ function milvus_ci_release_name(){
 
     fi 
 
+    if [[ "${MODE:-}" == "gpu" ]]; then
+        name+="-gpu"
+    fi
+
     export MILVUS_HELM_RELEASE_NAME=${name}
     echo ${name}
 }