From cfb9b0e14df3624e2a63ff85e02fa2fe7a5ad07b Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Tue, 22 Nov 2022 15:18:29 +0800 Subject: [PATCH 1/7] test:add testcase of enterprise installPackages --- packaging/testpackage.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/testpackage.sh b/packaging/testpackage.sh index 846c8d160f..dbc46b8e55 100755 --- a/packaging/testpackage.sh +++ b/packaging/testpackage.sh @@ -206,6 +206,10 @@ else fi +if [[ ${packgeName} =~ "server" ]] ;then + echoColor BD " pkill -9 taosd " + pkill -9 taosd +fi echoColor G "===== new workroom path =====" From b883929c54dd7b0eab93e259dc597737769a0050 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Tue, 22 Nov 2022 21:38:13 +0800 Subject: [PATCH 2/7] test:add testcase of enterprise installPackages --- packaging/MPtestJenkinsfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packaging/MPtestJenkinsfile b/packaging/MPtestJenkinsfile index dad5b7f129..c8b0fdbf5d 100644 --- a/packaging/MPtestJenkinsfile +++ b/packaging/MPtestJenkinsfile @@ -274,9 +274,8 @@ pipeline { do cd ${TDENGINE_ROOT_DIR}/packaging bash testpackage.sh -f server -m ${verModeSin} -f client -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar - python3 checkPackageRuning.py + python3 checkPackageRuning.py 192.168.0.21 done - python3 checkPackageRuning.py 192.168.0.21 ''' } } @@ -289,7 +288,6 @@ pipeline { verModeList=community cd ${TDENGINE_ROOT_DIR}/packaging bash testpackage.sh -f server -m ${verModeSin} -f client -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar - python3 checkPackageRuning.py python3 checkPackageRuning.py 192.168.0.24 ''' } @@ -310,9 +308,8 @@ pipeline { do cd ${TDENGINE_ROOT_DIR}/packaging bash testpackage.sh -f server -m ${verModeSin} -f client -l false -c arm64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar - python3 checkPackageRuning.py + python3 checkPackageRuning.py 192.168.0.21 done - python3 checkPackageRuning.py 192.168.0.21 ''' } } From 305e580366a65a0616ea8cd560e2984abbe77ad5 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Tue, 22 Nov 2022 21:48:45 +0800 Subject: [PATCH 3/7] test:add testcase of enterprise installPackages --- packaging/MPtestJenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packaging/MPtestJenkinsfile b/packaging/MPtestJenkinsfile index c8b0fdbf5d..2e19bd56ee 100644 --- a/packaging/MPtestJenkinsfile +++ b/packaging/MPtestJenkinsfile @@ -285,9 +285,8 @@ pipeline { steps { timeout(time: 30, unit: 'MINUTES'){ sh ''' - verModeList=community cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m ${verModeSin} -f client -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -f server -m community -f client -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py 192.168.0.24 ''' } From 45e1ac3a0ae0aad4508057e504c69aea0eb6fd52 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 23 Nov 2022 12:47:17 +0800 Subject: [PATCH 4/7] test:add testcase of enterprise installPackages --- packaging/MPtestJenkinsfile | 32 ++++++++++++++++---------------- packaging/testpackage.sh | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packaging/MPtestJenkinsfile b/packaging/MPtestJenkinsfile index 2e19bd56ee..0570bae191 100644 --- a/packaging/MPtestJenkinsfile +++ b/packaging/MPtestJenkinsfile @@ -120,20 +120,20 @@ pipeline { for verModeSin in ${verModeList} do cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m ${verModeSin} -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m ${verModeSin} -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py done ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t deb + bash testpackage.sh -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t deb python3 checkPackageRuning.py ''' } @@ -152,20 +152,20 @@ pipeline { for verModeSin in ${verModeList} do cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m ${verModeSin} -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m ${verModeSin} -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py done ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t deb + bash testpackage.sh -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t deb python3 checkPackageRuning.py dpkg -r tdengine ''' @@ -185,20 +185,20 @@ pipeline { for verModeSin in ${verModeList} do cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m ${verModeSin} -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py done ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t rpm + bash testpackage.sh -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t rpm python3 checkPackageRuning.py ''' } @@ -217,20 +217,20 @@ pipeline { for verModeSin in ${verModeList} do cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m ${verModeSin} -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m ${verModeSin} -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py done ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m community -f server -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py ''' sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t rpm + bash testpackage.sh -m community -f server -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t rpm python3 checkPackageRuning.py sudo rpm -e tdengine ''' @@ -250,7 +250,7 @@ pipeline { for verModeSin in ${verModeList} do cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m ${verModeSin} -f server -l false -c arm64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m ${verModeSin} -f server -l false -c arm64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py done ''' @@ -273,7 +273,7 @@ pipeline { for verModeSin in ${verModeList} do cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m ${verModeSin} -f client -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m ${verModeSin} -f client -l false -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py 192.168.0.21 done ''' @@ -286,7 +286,7 @@ pipeline { timeout(time: 30, unit: 'MINUTES'){ sh ''' cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m community -f client -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m community -f client -l true -c x64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py 192.168.0.24 ''' } @@ -306,7 +306,7 @@ pipeline { for verModeSin in ${verModeList} do cd ${TDENGINE_ROOT_DIR}/packaging - bash testpackage.sh -f server -m ${verModeSin} -f client -l false -c arm64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar + bash testpackage.sh -m ${verModeSin} -f client -l false -c arm64 -v ${version} -o ${baseVersion} -s ${sourcePath} -t tar python3 checkPackageRuning.py 192.168.0.21 done ''' diff --git a/packaging/testpackage.sh b/packaging/testpackage.sh index dbc46b8e55..78d5043b0c 100755 --- a/packaging/testpackage.sh +++ b/packaging/testpackage.sh @@ -338,7 +338,7 @@ elif ([[ ${packgeName} =~ "arm64" ]] && [[ ${packgeName} =~ "client" ]]);then echoColor G "===== install taos-tools arm when package is arm64-client =====" cd ${installPath} if [ ! -f "taosTools-2.1.3-Linux-x64.tar.gz " ];then - wgetFile taosTools-2.1.3-Linux-x64.tar.gz v2.1.3 web + wgetFile taosTools-2.1.3-Linux-arm64.tar.gz v2.1.3 web tar xf taosTools-2.1.3-Linux-arm64.tar.gz fi From 2e3d15d6cfc6e2e835884d1d811e5eab0dfe8742 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 23 Nov 2022 16:57:59 +0800 Subject: [PATCH 5/7] ci:update ci server --- Jenkinsfile2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 33c3ef55c9..ac36f0e69e 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -361,7 +361,7 @@ pipeline { } parallel { stage('check docs') { - agent{label " worker03 || slave215 || slave217 || slave219 || Mac_catalina "} + agent{label " slave1_47 "} steps { check_docs() } @@ -407,7 +407,7 @@ pipeline { } } stage('linux test') { - agent{label " worker03 || slave215 || slave217 || slave219 "} + agent{label " slave1_47 "} options { skipDefaultCheckout() } when { changeRequest() From 5a4b7e95ebf0341c3b341512dae96f4b96a2e4f1 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 23 Nov 2022 21:56:12 +0800 Subject: [PATCH 6/7] ci:test ci --- Jenkinsfile2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index ac599aa3a6..3e953dc4e0 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -361,7 +361,7 @@ pipeline { } parallel { stage('check docs') { - agent{label " slave1_47 "} + agent{label " slave1_48 "} steps { check_docs() } @@ -407,7 +407,7 @@ pipeline { } } stage('linux test') { - agent{label " slave1_47 "} + agent{label " slave1_48 "} options { skipDefaultCheckout() } when { changeRequest() From 54e6d72c2d6e4e0891fde2f011f7317b77d5ccf2 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Sun, 27 Nov 2022 18:01:07 +0800 Subject: [PATCH 7/7] test:add win testcase in ci --- tests/system-test/test-all.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-test/test-all.bat b/tests/system-test/test-all.bat index 22b10fa01f..dd1ec6deab 100644 --- a/tests/system-test/test-all.bat +++ b/tests/system-test/test-all.bat @@ -90,7 +90,7 @@ goto :eof :CheckSkipCase set skipCase=false -if "%*" == "python3 ./test.py -f 1-insert/insertWithMoreVgroup.py" ( set skipCase=true ) -if "%*" == "python3 ./test.py -f 2-query/queryQnode.py" ( set skipCase=true ) +if "%*" == "python3 ./test.py -f 1-insert/insertWithMoreVgroup.py" ( set skipCase=false ) +if "%*" == "python3 ./test.py -f 2-query/queryQnode.py" ( set skipCase=false ) echo %* | grep "\-R" && set skipCase=true :goto eof \ No newline at end of file