From 6b46ac5f54f3ddad2f039386a5237492cc13ad1e Mon Sep 17 00:00:00 2001
From: tomchon <haoran920c@163.com>
Date: Mon, 29 Aug 2022 16:11:33 +0800
Subject: [PATCH] test: add checkpackages scritps

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

diff --git a/packaging/MPtestJenkinsfile b/packaging/MPtestJenkinsfile
index 0782038c03..5e259d56be 100644
--- a/packaging/MPtestJenkinsfile
+++ b/packaging/MPtestJenkinsfile
@@ -1,8 +1,7 @@
 def sync_source(branch_name) {
     sh '''
         hostname
-        IP
-        env
+        ip addr|grep 192|awk  '{print $2}'|sed "s/\\/.*//"  
         echo ''' + branch_name + '''
     '''
     sh '''
@@ -73,7 +72,7 @@ pipeline {
         BRANCH_NAME = '3.0'
 
         TD_SERVER_TAR = "TDengine-server-${version}-Linux-x64.tar.gz"
-        BASE_TD_SERVER_TAR = "TDengine-server-${baseVersion}-arm64-x64.tar.gz"
+        BASE_TD_SERVER_TAR = "TDengine-server-${baseVersion}-Linux-x64.tar.gz"
 
         TD_SERVER_ARM_TAR = "TDengine-server-${version}-Linux-arm64.tar.gz"
         BASE_TD_SERVER_ARM_TAR = "TDengine-server-${baseVersion}-Linux-arm64.tar.gz"
@@ -82,7 +81,7 @@ pipeline {
         BASE_TD_SERVER_LITE_TAR = "TDengine-server-${baseVersion}-Linux-x64-Lite.tar.gz"
 
         TD_CLIENT_TAR = "TDengine-client-${version}-Linux-x64.tar.gz"
-        BASE_TD_CLIENT_TAR = "TDengine-client-${baseVersion}-arm64-x64.tar.gz"
+        BASE_TD_CLIENT_TAR = "TDengine-client-${baseVersion}-Linux-x64.tar.gz"
 
         TD_CLIENT_ARM_TAR = "TDengine-client-${version}-Linux-arm64.tar.gz"
         BASE_TD_CLIENT_ARM_TAR = "TDengine-client-${baseVersion}-Linux-arm64.tar.gz"
@@ -114,7 +113,6 @@ pipeline {
                             cd ${TDENGINE_ROOT_DIR}/packaging
                             bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
                             python3 checkPackageRuning.py  
-                            rmtaos
                             '''
                             sh '''
                             cd ${TDENGINE_ROOT_DIR}/packaging
@@ -138,7 +136,6 @@ pipeline {
                             cd ${TDENGINE_ROOT_DIR}/packaging
                             bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
                             python3 checkPackageRuning.py  
-                            rmtaos
                             '''
                             sh '''
                             cd ${TDENGINE_ROOT_DIR}/packaging
@@ -162,12 +159,10 @@ pipeline {
                             cd ${TDENGINE_ROOT_DIR}/packaging
                             bash testpackage.sh ${TD_SERVER_TAR} ${version} ${BASE_TD_SERVER_TAR} ${baseVersion} server
                             python3 checkPackageRuning.py  
-                            rmtaos
                             '''
                             sh '''
                             cd ${TDENGINE_ROOT_DIR}/packaging
                             bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
-                            bash testpackage.sh ${TD_SERVER_LITE_TAR} ${version} ${BASE_TD_SERVER_LITE_TAR} ${baseVersion} server
                             python3 checkPackageRuning.py  
                             '''
                             sh '''
diff --git a/packaging/testpackage.sh b/packaging/testpackage.sh
index 3ca31ea7a4..148aabc091 100755
--- a/packaging/testpackage.sh
+++ b/packaging/testpackage.sh
@@ -55,9 +55,9 @@ if command -v ${comd} ;then
     echo "${comd} is already installed" 
 else 
     if command -v apt ;then
-        apt-get install ${comd}
+        apt-get install ${comd} -y 
     elif command -v yum ;then
-        yum install ${comd}
+        yum install ${comd} - y
     else
         echo "you should install ${comd} manually"
     fi
@@ -153,6 +153,7 @@ elif [[ ${packgeName} =~ "tar" ]];then
         wget https://www.taosdata.com/assets-download/3.0/taosTools-2.1.2-Linux-x64.tar.gz
         tar xvf taosTools-2.1.2-Linux-x64.tar.gz
         cd taosTools-2.1.2 && bash install-taostools.sh
+    fi
 
 fi 
 # }