diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile index aa1815fc634e423f69169415a666d4181fdeb1fc..2f8b0de09d928404ae5e2f2925a452b4e1bfa150 100644 --- a/tests/Jenkinsfile +++ b/tests/Jenkinsfile @@ -55,6 +55,8 @@ pipeline { sh ''' cd ${WKC}/tests ./test-all.sh b1 + cd ${WKC}/tests + ./test-all.sh full jdbc date''' } } diff --git a/tests/test-all.sh b/tests/test-all.sh index a99a4dd9060207044eb457c6185201feaf6cd0fe..5314c201d8ea6541690e5568cd1846f007a986f5 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -10,6 +10,18 @@ NC='\033[0m' tests_dir=`pwd` IN_TDINTERNAL="community" +function stopTaosd { + echo "Stop taosd" + systemctl stop taosd + PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'` + while [ -n "$PID" ] + do + pkill -TERM -x taosd + sleep 1 + PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'` + done +} + function dohavecore(){ corefile=`find $corepath -mmin 1` if [ -n "$corefile" ];then @@ -301,6 +313,7 @@ if [ "$2" != "sim" ] && [ "$2" != "python" ] && [ "$1" == "full" ]; then pwd cd debug/ + stopTaosd nohup build/bin/taosd -c /etc/taos/ > /dev/null 2>&1 & sleep 30