[TD-3443]<test>fix taosd deadlock in CI

This commit is contained in:
liuyq-617 2021-03-25 16:16:50 +08:00
parent 093efa1117
commit c10285f1a0
2 changed files with 11 additions and 9 deletions

2
Jenkinsfile vendored
View File

@ -39,7 +39,7 @@ def pre_test(){
sudo rmtaos || echo "taosd has not installed"
'''
sh '''
ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9
ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9 //avoid taosd deadlock
cd ${WKC}
git checkout develop
git reset --hard HEAD~10 >/dev/null

18
tests/Jenkinsfile vendored
View File

@ -56,14 +56,8 @@ pipeline {
cd ${WKC}/tests
./test-all.sh b1
date'''
sh '''
cd ${WKC}/tests
./test-all.sh full jdbc
date'''
sh '''
cd ${WKC}/tests
./test-all.sh full unit
date'''
}
}
@ -136,6 +130,10 @@ pipeline {
./test-all.sh b2
date
'''
sh '''
cd ${WKC}/tests
./test-all.sh full unit
date'''
}
}
@ -154,6 +152,10 @@ pipeline {
'''
}
sh '''
cd ${WKC}/tests
./test-all.sh full jdbc
date'''
sh '''
cd ${WKC}/tests/pytest
./valgrind-test.sh 2>&1 > mem-error-out.log
./handle_val_log.sh