From fd3ef9b11b8e07aea7f03f2baed915b36e8a5470 Mon Sep 17 00:00:00 2001
From: zhuwenxing <wenxing.zhu@zilliz.com>
Date: Thu, 31 Mar 2022 09:19:32 +0800
Subject: [PATCH] [skip e2e]Update deploy test script (#16280)

Signed-off-by: zhuwenxing <wenxing.zhu@zilliz.com>
---
 tests/python_client/deploy/scripts/get_tag.py | 10 +++++-----
 tests/python_client/deploy/test.sh            | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/python_client/deploy/scripts/get_tag.py b/tests/python_client/deploy/scripts/get_tag.py
index 98c0d571d4..ee058cac9a 100644
--- a/tests/python_client/deploy/scripts/get_tag.py
+++ b/tests/python_client/deploy/scripts/get_tag.py
@@ -18,15 +18,15 @@ def get_tag(url):
 
 
 latest_tag = [tag for tag in get_tag(milvus_dev) if "latest" not in tag][-1]
-latest_rc_tag = [tag for tag in get_tag(milvus) if "rc" and "v" in tag][-1]
-release_version = "-".join(latest_rc_tag.split("-")[:-2])
-print(release_version)
+latest_rc_tag = [tag for tag in get_tag(milvus) if "v" in tag][-1]
+# release_version = "-".join(latest_rc_tag.split("-")[:-2])
+# print(release_version)
 print(latest_tag, latest_rc_tag)
 
 data = {
     "latest_tag": latest_tag,
-    "latest_rc_tag": latest_rc_tag[1:],
-    "release_version": release_version
+    "latest_rc_tag": latest_rc_tag,
+    # "release_version": release_version
 }
 print(data)
 with open("tag_info.json", "w") as f:
diff --git a/tests/python_client/deploy/test.sh b/tests/python_client/deploy/test.sh
index 42f9795e80..32b6914ff5 100644
--- a/tests/python_client/deploy/test.sh
+++ b/tests/python_client/deploy/test.sh
@@ -59,14 +59,15 @@ function error_exit {
 }
 
 function replace_image_tag {
-    image_tag=$1
+    image_repo=$1
+    image_tag=$2
     if [ "$platform" == "Mac" ];
     then
         # for mac os
-        sed -i "" "s/milvusdb\/milvus.*/milvusdb\/milvus-dev\:${image_tag}/g" docker-compose.yml   
+        sed -i "" "s/milvusdb\/milvus.*/${image_repo}\:${image_tag}/g" docker-compose.yml   
     else
         #for linux os 
-        sed -i "s/milvusdb\/milvus.*/milvusdb\/milvus-dev\:${image_tag}/g" docker-compose.yml
+        sed -i "s/milvusdb\/milvus.*/${image_repo}\:${image_tag}/g" docker-compose.yml
     fi
 
 }
@@ -120,12 +121,12 @@ python scripts/get_tag.py
 
 latest_tag=$(jq -r ".latest_tag" tag_info.json)
 latest_rc_tag=$(jq -r ".latest_rc_tag" tag_info.json)
-release_version="v2.0.0"
-echo $release_version
+# release_version="v${Release}"
+echo $latest_rc_tag
 
 pushd ${Deploy_Dir}
 # download docker-compose.yml
-wget https://github.com/milvus-io/milvus/releases/download/${release_version}/milvus-${Mode}-docker-compose.yml -O docker-compose.yml
+wget https://github.com/milvus-io/milvus/releases/download/${latest_rc_tag}/milvus-${Mode}-docker-compose.yml -O docker-compose.yml
 ls
 # clean env to deploy a fresh milvus
 docker-compose down
@@ -138,12 +139,12 @@ then
     printf "download latest milvus docker-compose yaml file from github\n"
     wget https://raw.githubusercontent.com/milvus-io/milvus/master/deployments/docker/${Mode}/docker-compose.yml -O docker-compose.yml
     printf "start to deploy latest rc tag milvus\n"
-    replace_image_tag $latest_tag
+    replace_image_tag "milvusdb\/milvus-dev" $latest_tag
 fi
 if [ "$Task" == "upgrade" ];
 then
     printf "start to deploy previous rc tag milvus\n"
-    replace_image_tag "master-20220125-6336e232" # replace previous rc tag
+    replace_image_tag "milvusdb\/milvus" $latest_rc_tag # replace previous rc tag
 
 fi
 cat docker-compose.yml|grep milvusdb
@@ -186,7 +187,7 @@ then
     printf "download latest milvus docker-compose yaml file from github\n"
     wget https://raw.githubusercontent.com/milvus-io/milvus/master/deployments/docker/${Mode}/docker-compose.yml -O docker-compose.yml
     printf "start to deploy latest rc tag milvus\n"
-    replace_image_tag $latest_tag
+    replace_image_tag "milvusdb\/milvus-dev" $latest_tag
 
 fi
 cat docker-compose.yml|grep milvusdb