From 6c5288b2ebadf8dc7314355cb2cdaea095da7d81 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Mon, 16 Aug 2021 16:16:13 +0800
Subject: [PATCH] update

---
 Jenkinsfile              | 9 +++------
 tests/pytest/fulltest.sh | 2 --
 tests/test-all.sh        | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 39ff596c2e..b6f9b54aa4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -227,24 +227,21 @@ pipeline {
               sh '''
                 rm -rf /var/lib/taos/*
                 rm -rf /var/log/taos/*
-                nohup taosd >/dev/null 
+                nohup taosd >/dev/null &
                 sleep 10
               '''
               sh '''
               cd ${WKC}/tests/examples/nodejs
-              git clean -dfx
-              npm install td2.0-connector
+              npm install td2.0-connector > /dev/null 2>&1
               node nodejsChecker.js host=localhost
               '''
               sh '''
                 cd ${WKC}/tests/examples/C#/taosdemo
-                git clean -dfx
                 mcs -out:taosdemo *.cs
-                ./taosdemo
+                echo '' |./taosdemo
               '''
               sh '''
                 cd ${WKC}/tests/gotest
-                git clean -dfx
                 bash batchtest.sh
               '''
               sh '''
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index 9546ea1402..d9c2fad6ad 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -369,8 +369,6 @@ python3 ./test.py -f insert/insert_locking.py
 python3 ./test.py -f alter/alter_debugFlag.py
 python3 ./test.py -f query/queryBetweenAnd.py
 python3 ./test.py -f tag_lite/alter_tag.py
-
-
 python3 test.py -f tools/taosdemoAllTest/TD-4985/query-limit-offset.py
 python3 test.py -f tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py
 python3 test.py -f tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.py
diff --git a/tests/test-all.sh b/tests/test-all.sh
index 8dd1ade9be..c18951b8ac 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -12,7 +12,7 @@ IN_TDINTERNAL="community"
 
 function stopTaosd {
 	echo "Stop taosd"
-  sudo systemctl stop taosd
+  sudo systemctl stop taosd || echo 'no sudo or systemctl or stop fail'
   PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
 	while [ -n "$PID" ]
 	do
-- 
GitLab