From c4f0c340f9d5690ab17d78f5130a816f7abb0775 Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Tue, 8 Nov 2022 17:25:28 +0800
Subject: [PATCH] test:modify two options that downloads the installPackages

---
 packaging/MPtestJenkinsfile |  4 ++--
 packaging/testpackage.sh    | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packaging/MPtestJenkinsfile b/packaging/MPtestJenkinsfile
index 6e0350d03b..5dc8024f29 100644
--- a/packaging/MPtestJenkinsfile
+++ b/packaging/MPtestJenkinsfile
@@ -39,7 +39,7 @@ pipeline {
     parameters {
         choice(
             name: 'sourcePath',
-            choices: ['web', 'nas'], 
+            choices: ['nas','web'], 
             description: 'choice which way to download the installation pacakge;web is Office Web and nas means taos nas server '
         )
         string (
@@ -67,7 +67,7 @@ pipeline {
         WORK_DIR = '/var/lib/jenkins/workspace'
         TDINTERNAL_ROOT_DIR = '/var/lib/jenkins/workspace/TDinternal'
         TDENGINE_ROOT_DIR = '/var/lib/jenkins/workspace/TDinternal/community'
-        BRANCH_NAME = 'test/TD-20194'
+        BRANCH_NAME = '3.0'
 
         TD_SERVER_TAR = "TDengine-server-${version}-Linux-x64.tar.gz"
         BASE_TD_SERVER_TAR = "TDengine-server-${baseVersion}-Linux-x64.tar.gz"
diff --git a/packaging/testpackage.sh b/packaging/testpackage.sh
index aca9ceae75..b0e33835dd 100755
--- a/packaging/testpackage.sh
+++ b/packaging/testpackage.sh
@@ -248,14 +248,19 @@ cd ${installPath}
 if [[ ${packgeName} =~ "Lite" ]]  ||   ([[ ${packgeName} =~ "x64" ]] && [[ ${packgeName} =~ "client" ]]) ||  ([[ ${packgeName} =~ "deb" ]] && [[ ${packgeName} =~ "server" ]])  || ([[ ${packgeName} =~ "rpm" ]] && [[ ${packgeName} =~ "server" ]]) ;then
     echoColor G "===== install taos-tools when package is lite or client ====="
     cd ${installPath}
-    wgetFile taosTools-2.1.3-Linux-x64.tar.gz v2.1.3 web
-    tar xf taosTools-2.1.3-Linux-x64.tar.gz  
+    if [ ! -f "taosTools-2.1.3-Linux-x64.tar.gz " ];then
+        wgetFile taosTools-2.1.3-Linux-x64.tar.gz v2.1.3 web
+        tar xf taosTools-2.1.3-Linux-x64.tar.gz  
+    fi
     cd taosTools-2.1.3 && bash install-taostools.sh
 elif  ([[ ${packgeName} =~ "arm64" ]] && [[ ${packgeName} =~ "client" ]]);then
     echoColor G "===== install taos-tools arm when package is arm64-client ====="
     cd ${installPath}
-    wgetFile taosTools-2.1.3-Linux-arm64.tar.gz  v2.1.3 web
-    tar xf taosTools-2.1.3-Linux-arm64.tar.gz
+    if [ ! -f "taosTools-2.1.3-Linux-x64.tar.gz " ];then
+        wgetFile taosTools-2.1.3-Linux-x64.tar.gz v2.1.3 web
+        tar xf taosTools-2.1.3-Linux-arm64.tar.gz
+    fi    
+    
     cd taosTools-2.1.3 && bash install-taostools.sh
 fi