Merge pull request #16518 from taosdata/test/chr/TD-14699

Test/chr/td 14699

packaging/MPtestJenkinsfile

@@ -182,7 +182,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

packaging/testpackage.sh

@@ -7,6 +7,7 @@ originPackageName=$3
 originversion=$4
 testFile=$5
 subFile="taos.tar.gz"
+password=$6
 
 if [ ${testFile} = "server" ];then
     tdPath="TDengine-server-${version}"
@@ -56,6 +57,7 @@ fi
 
 cmdInstall tree
 cmdInstall wget
+cmdInstall sshpass
 
 echo "new workroom path"
 installPath="/usr/local/src/packageTest"
@@ -74,24 +76,49 @@ else
     echo "${oriInstallPath} already exists"
 fi
 
-echo "decompress installPackage"
 
-cd ${installPath}
-wget https://www.taosdata.com/assets-download/3.0/${packgeName}
-cd  ${oriInstallPath}
-wget https://www.taosdata.com/assets-download/3.0/${originPackageName}
 
 
+echo "download  installPackage"
+# cd ${installPath}
+# wget https://www.taosdata.com/assets-download/3.0/${packgeName}
+# cd  ${oriInstallPath}
+# wget https://www.taosdata.com/assets-download/3.0/${originPackageName}
+
+cd ${installPath}
+if [ ! -f  {packgeName}  ];then
+    sshpass -p ${password} scp 192.168.1.131:/nas/TDengine3/v${version}/community/${packgeName}  .
+fi
+if [ ! -f  debAuto.sh  ];then
+    echo '#!/usr/bin/expect ' >  debAuto.sh
+    echo 'set timeout 3 ' >>  debAuto.sh
+    echo 'pset packgeName [lindex $argv 0]' >>  debAuto.sh
+    echo 'spawn dpkg -i ${packgeName}' >>  debAuto.sh
+    echo 'expect "*one:"' >>  debAuto.sh
+    echo 'send  "\r"' >>  debAuto.sh
+    echo 'expect "*skip:"' >>  debAuto.sh
+    echo 'send  "\r" ' >>  debAuto.sh
+fi
+
 if [[ ${packgeName} =~ "deb" ]];then
     cd ${installPath}
-    echo "dpkg ${packgeName}" &&  dpkg -i ${packgeName}
+    dpkg -r taostools
+    dpkg -r tdengine
+    if [[ ${packgeName} =~ "TDengine" ]];then
+        echo "./debAuto.sh ${packgeName}" &&   chmod 755 debAuto.sh &&  ./debAuto.sh ${packgeName}
+    else
+        echo "dpkg  -i ${packgeName}" &&   dpkg  -i ${packgeName}
+
 elif [[ ${packgeName} =~ "rpm" ]];then
     cd ${installPath}
-    echo "rpm ${packgeName}"  && rpm -ivh ${packgeName}
+    echo "rpm ${packgeName}"  && rpm -ivh ${packgeName}  --quiet 
 elif [[ ${packgeName} =~ "tar" ]];then
-    echo "tar ${packgeName}" && tar -xvf ${packgeName} 
-    cd ${oriInstallPath}
+    cd  ${oriInstallPath}
+    if [ ! -f  {originPackageName}  ];then
+        sshpass -p ${password} scp 192.168.1.131:/nas/TDengine3/v${originversion}/community${originPackageName} .
+    fi
     echo "tar -xvf ${originPackageName}" && tar -xvf ${originPackageName} 
+
     cd ${installPath} 
     echo "tar -xvf ${packgeName}" && tar -xvf ${packgeName} 
 
@@ -105,10 +132,10 @@ elif [[ ${packgeName} =~ "tar" ]];then
 
     cd ${installPath} 
 
-    tree ${oriInstallPath}/${originTdpPath} > ${originPackageName}_checkfile
-    tree ${installPath}/${tdPath} > ${packgeName}_checkfile
+    tree ${oriInstallPath}/${originTdpPath} >  ${oriInstallPath}/${originPackageName}_checkfile
+    tree ${installPath}/${tdPath} > ${installPath}/${packgeName}_checkfile
 
-    diff  ${packgeName}_checkfile  ${originPackageName}_checkfile  > ${installPath}/diffFile.log
+    diff  ${installPath}/${packgeName}_checkfile ${oriInstallPath}/${originPackageName}_checkfile  > ${installPath}/diffFile.log
     diffNumbers=`cat ${installPath}/diffFile.log |wc -l `
     if [ ${diffNumbers} != 0 ];then
         echo "The number and names of files have changed from the previous installation package"
@@ -122,11 +149,20 @@ elif [[ ${packgeName} =~ "tar" ]];then
     else
         bash ${installCmd} 
     fi
-    if [[ ${packgeName} =~ "Lite" ]];then
+    if [[ ${packgeName} =~ "Lite" ]] &&  [[ ${packgeName} =~ "tar" ]]  ;then
         cd ${installPath}
-        wget https://www.taosdata.com/assets-download/3.0/taosTools-2.1.2-Linux-x64.tar.gz
+        sshpass -p ${password}   scp 192.168.1.131:/nas/TDengine3/v${version}/community/taosTools-2.1.2-Linux-x64.tar.gz .
+        # 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
+    elif [[ ${packgeName} =~ "Lite" ]] &&  [[ ${packgeName} =~ "deb" ]] ;then
+        cd ${installPath}
+        sshpass -p ${password}   scp 192.168.1.131:/nas/TDengine3/v${version}/community/taosTools-2.1.2-Linux-x64.deb .
+        dpkg -i taosTools-2.1.2-Linux-x64.deb 
+    elif [[ ${packgeName} =~ "Lite" ]] &&  [[ ${packgeName} =~ "rpm" ]]  ;then
+        cd ${installPath}
+        sshpass -p ${password}   scp 192.168.1.131:/nas/TDengine3/v${version}/community/taosTools-2.1.2-Linux-x64.rpm .
+        rpm -ivh taosTools-2.1.2-Linux-x64.rpm --quiet 
     fi
 
 fi