From 6c96795ab14a70ed685c0b9bf47565a71ef1fdbc Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 19 Mar 2021 14:14:21 +0800 Subject: [PATCH 1/3] [TD-3367]restore last_cache --- tests/pytest/fulltest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh index d6849dea7d..46a1abf12c 100755 --- a/tests/pytest/fulltest.sh +++ b/tests/pytest/fulltest.sh @@ -275,7 +275,7 @@ python3 ./test.py -f functions/function_twa.py -r 1 python3 ./test.py -f functions/function_twa_test2.py python3 ./test.py -f functions/function_stddev_td2555.py python3 ./test.py -f insert/metadataUpdate.py -#python3 ./test.py -f query/last_cache.py +python3 ./test.py -f query/last_cache.py python3 ./test.py -f query/last_row_cache.py python3 ./test.py -f account/account_create.py python3 ./test.py -f alter/alter_table.py From 41884e2803d0b3ae7e6b8b59f5be7932eed67661 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 19 Mar 2021 16:58:37 +0800 Subject: [PATCH 2/3] fix rmtaos error --- Jenkinsfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68fe4879c1..029b03f2ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,11 +32,10 @@ def abort_previous(){ milestone(buildNumber) } def pre_test(){ - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh ''' - sudo rmtaos - ''' - } + + sh ''' + sudo rmtaos || echo "taosd has not installed " + ''' sh ''' cd ${WKC} From 76643f0f5db561a16947c4304861525a2511103f Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 19 Mar 2021 17:37:44 +0800 Subject: [PATCH 3/3] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 029b03f2ad..d96eeaa724 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ def abort_previous(){ def pre_test(){ sh ''' - sudo rmtaos || echo "taosd has not installed " + sudo rmtaos || echo "taosd has not installed" ''' sh '''