From 6e394c634eb38050c2709f28fc3423bfb5dacdb7 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 17:05:21 +0800 Subject: [PATCH 01/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 18 +++++++++++++++++- tests/parallel_test/tdgpt_cases.task | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/parallel_test/tdgpt_cases.task diff --git a/Jenkinsfile2 b/Jenkinsfile2 index f44339c8c1..b431deb1cf 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -465,6 +465,9 @@ pipeline { steps { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 126, unit: 'MINUTES'){ + if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { + echo "skip windows test because of forecastoperator.c or anomalywindowoperator.c" + } else { pre_test_win() pre_test_build_win() run_win_ctest() @@ -478,6 +481,9 @@ pipeline { steps { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 60, unit: 'MINUTES'){ + if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { + echo "skip mac test because of forecastoperator.c or anomalywindowoperator.c" + } else { pre_test() pre_test_build_mac() } @@ -550,12 +556,22 @@ pipeline { cd ${WKC}/tests/parallel_test ./run_scan_container.sh -d ${WKDIR} -b ${BRANCH_NAME}_${BUILD_ID} -f ${WKDIR}/tmp/${BRANCH_NAME}_${BUILD_ID}/docs_changed.txt ''' + extra_param + ''' ''' - sh ''' + if ( file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { +] sh ''' + cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 + date + ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' + ''' + } else { + sh ''' cd ${WKC}/tests/parallel_test export DEFAULT_RETRY_TIME=2 date ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' ''' + } + } } } diff --git a/tests/parallel_test/tdgpt_cases.task b/tests/parallel_test/tdgpt_cases.task new file mode 100644 index 0000000000..e028d13fb8 --- /dev/null +++ b/tests/parallel_test/tdgpt_cases.task @@ -0,0 +1,6 @@ +#Column Define +#caseID,rerunTimes,Run with Sanitizer,casePath,caseCommand +#NA,NA,y or n,script,./test.sh -f tsim/user/basic.sim + +#tdgpt-test +,,y,script,./test.sh -f tsim/query/timeline.sim From 6159a06ee7f4543318235133cfe01c798f95fe23 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 17:16:58 +0800 Subject: [PATCH 02/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index b431deb1cf..4cbdfb8239 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -472,6 +472,7 @@ pipeline { pre_test_build_win() run_win_ctest() run_win_test() + } } } } @@ -486,6 +487,7 @@ pipeline { } else { pre_test() pre_test_build_mac() + } } } } @@ -556,22 +558,21 @@ pipeline { cd ${WKC}/tests/parallel_test ./run_scan_container.sh -d ${WKDIR} -b ${BRANCH_NAME}_${BUILD_ID} -f ${WKDIR}/tmp/${BRANCH_NAME}_${BUILD_ID}/docs_changed.txt ''' + extra_param + ''' ''' - if ( file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { -] sh ''' - cd ${WKC}/tests/parallel_test - export DEFAULT_RETRY_TIME=2 - date - ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' - ''' + if ( file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/ ) { + sh ''' + cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 + date + ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' + ''' } else { sh ''' - cd ${WKC}/tests/parallel_test - export DEFAULT_RETRY_TIME=2 - date - ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' + cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 + date + ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' ''' } - } } } From 7688c3b7d98efb809498fce75450e2ff264b2ad5 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 17:23:55 +0800 Subject: [PATCH 03/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 14 ++++++++------ source/libs/executor/src/forecastoperator.c | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 4cbdfb8239..b151930891 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -466,12 +466,14 @@ pipeline { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 126, unit: 'MINUTES'){ if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { - echo "skip windows test because of forecastoperator.c or anomalywindowoperator.c" + sh ''' + echo "skip windows test because of tdgpt codes changed" + ''' } else { - pre_test_win() - pre_test_build_win() - run_win_ctest() - run_win_test() + pre_test_win() + pre_test_build_win() + run_win_ctest() + run_win_test() } } } @@ -483,7 +485,7 @@ pipeline { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 60, unit: 'MINUTES'){ if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { - echo "skip mac test because of forecastoperator.c or anomalywindowoperator.c" + echo "skip mac test because of tdgpt codes changed" } else { pre_test() pre_test_build_mac() diff --git a/source/libs/executor/src/forecastoperator.c b/source/libs/executor/src/forecastoperator.c index bf1efc54ca..a56b0dd214 100644 --- a/source/libs/executor/src/forecastoperator.c +++ b/source/libs/executor/src/forecastoperator.c @@ -169,6 +169,7 @@ static int32_t forecastCloseBuf(SForecastSupp* pSupp) { code = taosAnalBufWriteOptInt(pBuf, "start", start); if (code != 0) return code; + bool hasEvery = taosAnalGetOptInt(pSupp->algoOpt, "every", &every); if (!hasEvery) { qDebug("forecast every not found from %s, use %" PRId64, pSupp->algoOpt, every); From 1aaf254ee82e25c1b8ea28c4b4c957181b4665f1 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 17:31:38 +0800 Subject: [PATCH 04/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index b151930891..5f3acae08c 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -463,17 +463,19 @@ pipeline { WIN_SYSTEM_TEST_ROOT="C:\\workspace\\${env.EXECUTOR_NUMBER}\\TDinternal\\community\\tests\\system-test" } steps { - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 126, unit: 'MINUTES'){ - if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { - sh ''' - echo "skip windows test because of tdgpt codes changed" - ''' - } else { - pre_test_win() - pre_test_build_win() - run_win_ctest() - run_win_test() + script { + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 126, unit: 'MINUTES'){ + if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { + sh ''' + echo "skip windows test because of tdgpt codes changed" + ''' + } else { + pre_test_win() + pre_test_build_win() + run_win_ctest() + run_win_test() + } } } } From 0755bf85e0dee7f383a580534012689a471e8b1d Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 17:48:46 +0800 Subject: [PATCH 05/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 5f3acae08c..5a6868b907 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -467,9 +467,7 @@ pipeline { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 126, unit: 'MINUTES'){ if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { - sh ''' - echo "skip windows test because of tdgpt codes changed" - ''' + echo "skip windows test because of tdgpt codes changed" } else { pre_test_win() pre_test_build_win() @@ -484,13 +482,15 @@ pipeline { stage('mac test') { agent{label " Mac_catalina "} steps { - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 60, unit: 'MINUTES'){ - if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { - echo "skip mac test because of tdgpt codes changed" - } else { - pre_test() - pre_test_build_mac() + script { + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 60, unit: 'MINUTES'){ + if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { + echo "skip mac test because of tdgpt codes changed" + } else { + pre_test() + pre_test_build_mac() + } } } } From 601d2f1c088a04f3cb471cd5d19d920e824869f3 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 20:04:30 +0800 Subject: [PATCH 06/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 23 +++++++++++++++++------ tests/army/tmq/a.py | 13 +++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 tests/army/tmq/a.py diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 5a6868b907..f163767557 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -6,6 +6,7 @@ node { file_zh_changed = '' file_en_changed = '' file_no_doc_changed = '1' +file_only_tdgpt_change_except = '1' def abortPreviousBuilds() { def currentJobName = env.JOB_NAME def currentBuildNumber = env.BUILD_NUMBER.toInteger() @@ -73,6 +74,14 @@ def check_docs(){ ''', returnStdout: true ).trim() + + file_only_tdgpt_change_except = sh ( + script: ''' + cat ${file_no_doc_changed} |grep -v "forecastoperator.c\\|anomalywindowoperator.c" || : + ''', + returnStdout: true + ).trim() + echo "file_zh_changed: ${file_zh_changed}" echo "file_en_changed: ${file_en_changed}" echo "file_no_doc_changed: ${file_no_doc_changed}" @@ -570,12 +579,14 @@ pipeline { ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' ''' } else { - sh ''' - cd ${WKC}/tests/parallel_test - export DEFAULT_RETRY_TIME=2 - date - ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' - ''' + if ( file_only_tdgpt_change_except != '' ) { + sh ''' + cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 + date + ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' + ''' + } } } } diff --git a/tests/army/tmq/a.py b/tests/army/tmq/a.py new file mode 100644 index 0000000000..9236e3a5b3 --- /dev/null +++ b/tests/army/tmq/a.py @@ -0,0 +1,13 @@ +import click + +@click.command() +@click.option('--count', default=1, help='Number of greetings.') +@click.option('--name', prompt='Your name', + help='The person to greet.') +def hello(count, name): + """Simple program that greets NAME for a total of COUNT times.""" + for x in range(count): + click.echo('Hello %s!' % name) + +if __name__ == '__main__': + hello() \ No newline at end of file From 041bd8a8dadf6410bc7e005d38214072f908be26 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 20:07:56 +0800 Subject: [PATCH 07/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index f163767557..5679015e32 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -471,6 +471,10 @@ pipeline { WIN_COMMUNITY_ROOT="C:\\workspace\\${env.EXECUTOR_NUMBER}\\TDinternal\\community" WIN_SYSTEM_TEST_ROOT="C:\\workspace\\${env.EXECUTOR_NUMBER}\\TDinternal\\community\\tests\\system-test" } + when { + beforeAgent true + expression { file_only_tdgpt_change_except != '' } + } steps { script { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { @@ -490,6 +494,10 @@ pipeline { } stage('mac test') { agent{label " Mac_catalina "} + when { + beforeAgent true + expression { file_only_tdgpt_change_except != '' } + } steps { script { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { From 7c1b9e3b4c85a86c75bbafec308b15c3bdcbe6f8 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 20:25:33 +0800 Subject: [PATCH 08/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 5679015e32..0b127279be 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -415,6 +415,7 @@ pipeline { } stage ('pre for build docs') { + agent any when { beforeAgent true expression { env.CHANGE_BRANCH =~ /(?i)doc.*/ || file_zh_changed != '' || file_en_changed != '' } @@ -426,6 +427,7 @@ pipeline { } stage('build Docs') { + agent any when { beforeAgent true expression { env.CHANGE_BRANCH =~ /(?i)doc.*/ || file_zh_changed != '' || file_en_changed != '' } @@ -458,6 +460,7 @@ pipeline { } stage('run test') { + agent any when { expression { file_no_doc_changed != '' && env.CHANGE_TARGET != 'docs-cloud' From 8db01e203a666b5e69401e6009cc7aabf54e7dcd Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 20:35:03 +0800 Subject: [PATCH 09/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 0b127279be..799cee70be 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -394,7 +394,7 @@ def run_win_test() { } pipeline { - agent none + agent any options { skipDefaultCheckout() } environment{ WKDIR = '/var/lib/jenkins/workspace' @@ -415,7 +415,6 @@ pipeline { } stage ('pre for build docs') { - agent any when { beforeAgent true expression { env.CHANGE_BRANCH =~ /(?i)doc.*/ || file_zh_changed != '' || file_en_changed != '' } @@ -427,7 +426,6 @@ pipeline { } stage('build Docs') { - agent any when { beforeAgent true expression { env.CHANGE_BRANCH =~ /(?i)doc.*/ || file_zh_changed != '' || file_en_changed != '' } @@ -460,7 +458,6 @@ pipeline { } stage('run test') { - agent any when { expression { file_no_doc_changed != '' && env.CHANGE_TARGET != 'docs-cloud' From 50a20292ddd5ba2caab20fb9d0c0b9cb5bd2b7f9 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 20:43:46 +0800 Subject: [PATCH 10/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 799cee70be..3a56695df9 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -85,6 +85,7 @@ def check_docs(){ echo "file_zh_changed: ${file_zh_changed}" echo "file_en_changed: ${file_en_changed}" echo "file_no_doc_changed: ${file_no_doc_changed}" + echo "file_only_tdgpt_change_except: ${file_only_tdgpt_change_except}" } } From 50aa05cfcc40a21cf4604665ba1e47496820b780 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 20:52:07 +0800 Subject: [PATCH 11/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 3a56695df9..f02c036563 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -77,7 +77,7 @@ def check_docs(){ file_only_tdgpt_change_except = sh ( script: ''' - cat ${file_no_doc_changed} |grep -v "forecastoperator.c\\|anomalywindowoperator.c" || : + echo ${file_no_doc_changed} |grep -v "forecastoperator.c\\|anomalywindowoperator.c" || : ''', returnStdout: true ).trim() From d390aec7ced8b0ac264b34433a90d8c08d95131c Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Mon, 25 Nov 2024 20:58:21 +0800 Subject: [PATCH 12/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index f02c036563..0e816a3f05 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -77,7 +77,8 @@ def check_docs(){ file_only_tdgpt_change_except = sh ( script: ''' - echo ${file_no_doc_changed} |grep -v "forecastoperator.c\\|anomalywindowoperator.c" || : + cd ${WKC} + git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${CHANGE_TARGET}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | grep -v "forecastoperator.c\\|anomalywindowoperator.c" || : ''', returnStdout: true ).trim() From 9248276ff3c15e89a98656e614879d6b71e8a7ce Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Tue, 26 Nov 2024 09:20:06 +0800 Subject: [PATCH 13/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 0e816a3f05..c1e03b3440 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -478,18 +478,12 @@ pipeline { expression { file_only_tdgpt_change_except != '' } } steps { - script { - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 126, unit: 'MINUTES'){ - if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { - echo "skip windows test because of tdgpt codes changed" - } else { - pre_test_win() - pre_test_build_win() - run_win_ctest() - run_win_test() - } - } + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 126, unit: 'MINUTES'){ + pre_test_win() + pre_test_build_win() + run_win_ctest() + run_win_test() } } } @@ -501,16 +495,10 @@ pipeline { expression { file_only_tdgpt_change_except != '' } } steps { - script { - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 60, unit: 'MINUTES'){ - if (file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/) { - echo "skip mac test because of tdgpt codes changed" - } else { - pre_test() - pre_test_build_mac() - } - } + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 60, unit: 'MINUTES'){ + pre_test() + pre_test_build_mac() } } } From 6d182355d5cbf0afeedfa835cb4998ba4a964023 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Tue, 26 Nov 2024 10:28:35 +0800 Subject: [PATCH 14/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index c1e03b3440..45da12ad76 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -576,32 +576,18 @@ pipeline { date ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' ''' - } else { - if ( file_only_tdgpt_change_except != '' ) { - sh ''' - cd ${WKC}/tests/parallel_test - export DEFAULT_RETRY_TIME=2 - date - ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' - ''' - } + } + if ( file_only_tdgpt_change_except != '' ) { + sh ''' + cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 + date + ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' + ''' } } } } - /*catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 15, unit: 'MINUTES'){ - script { - sh ''' - echo "packaging ..." - date - rm -rf ${WKC}/release/* - cd ${WKC}/packaging - ./release.sh -v cluster -n 3.0.0.100 -s static - ''' - } - } - }*/ } } } From 9125e60a5aba81913607de7a1487a253f2c73a33 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 14:14:52 +0800 Subject: [PATCH 15/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 4 ++-- tests/army/tmq/a.py | 13 ------------- tests/parallel_test/tdgpt_cases.task | 4 ++-- tests/script/tsim/analytics/basic0.sim | 2 +- 4 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 tests/army/tmq/a.py diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 45da12ad76..a197d9a9a8 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -78,7 +78,7 @@ def check_docs(){ file_only_tdgpt_change_except = sh ( script: ''' cd ${WKC} - git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${CHANGE_TARGET}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | grep -v "forecastoperator.c\\|anomalywindowoperator.c" || : + git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${CHANGE_TARGET}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | grep -v "forecastoperator.c\\|anomalywindowoperator.c" |grep -v "tsim/analytics" || : ''', returnStdout: true ).trim() @@ -569,7 +569,7 @@ pipeline { cd ${WKC}/tests/parallel_test ./run_scan_container.sh -d ${WKDIR} -b ${BRANCH_NAME}_${BUILD_ID} -f ${WKDIR}/tmp/${BRANCH_NAME}_${BUILD_ID}/docs_changed.txt ''' + extra_param + ''' ''' - if ( file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c/ ) { + if ( file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c|tsim\/analytics/ ) { sh ''' cd ${WKC}/tests/parallel_test export DEFAULT_RETRY_TIME=2 diff --git a/tests/army/tmq/a.py b/tests/army/tmq/a.py deleted file mode 100644 index 9236e3a5b3..0000000000 --- a/tests/army/tmq/a.py +++ /dev/null @@ -1,13 +0,0 @@ -import click - -@click.command() -@click.option('--count', default=1, help='Number of greetings.') -@click.option('--name', prompt='Your name', - help='The person to greet.') -def hello(count, name): - """Simple program that greets NAME for a total of COUNT times.""" - for x in range(count): - click.echo('Hello %s!' % name) - -if __name__ == '__main__': - hello() \ No newline at end of file diff --git a/tests/parallel_test/tdgpt_cases.task b/tests/parallel_test/tdgpt_cases.task index e028d13fb8..015f2a005a 100644 --- a/tests/parallel_test/tdgpt_cases.task +++ b/tests/parallel_test/tdgpt_cases.task @@ -1,6 +1,6 @@ #Column Define #caseID,rerunTimes,Run with Sanitizer,casePath,caseCommand -#NA,NA,y or n,script,./test.sh -f tsim/user/basic.sim +#NA,NA,y or n,script,./test.sh -f tsim/analytics/basic0.sim #tdgpt-test -,,y,script,./test.sh -f tsim/query/timeline.sim +,,y,script,./test.sh -f tsim/analytics/basic0.sim \ No newline at end of file diff --git a/tests/script/tsim/analytics/basic0.sim b/tests/script/tsim/analytics/basic0.sim index a4fe6354ae..77c9184e8f 100644 --- a/tests/script/tsim/analytics/basic0.sim +++ b/tests/script/tsim/analytics/basic0.sim @@ -4,7 +4,7 @@ system sh/exec.sh -n dnode1 -s start sql connect print =============== create anode -sql create anode '127.0.0.1:6090' +sql create anode '192.168.1.116:6050' sql show anodes if $rows != 1 then From b0e3f24953e94f3ed0ebdd2a55004a0cef09e8df Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 14:40:27 +0800 Subject: [PATCH 16/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 4 ++-- tests/parallel_test/tdgpt_cases.task | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index a197d9a9a8..85683a6350 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -78,7 +78,7 @@ def check_docs(){ file_only_tdgpt_change_except = sh ( script: ''' cd ${WKC} - git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${CHANGE_TARGET}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | grep -v "forecastoperator.c\\|anomalywindowoperator.c" |grep -v "tsim/analytics" || : + git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${CHANGE_TARGET}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | grep -v "forecastoperator.c\\|anomalywindowoperator.c" |grep -v "tsim/analytics" |grep -v "tdgpt_cases.task" || : ''', returnStdout: true ).trim() @@ -569,7 +569,7 @@ pipeline { cd ${WKC}/tests/parallel_test ./run_scan_container.sh -d ${WKDIR} -b ${BRANCH_NAME}_${BUILD_ID} -f ${WKDIR}/tmp/${BRANCH_NAME}_${BUILD_ID}/docs_changed.txt ''' + extra_param + ''' ''' - if ( file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c|tsim\/analytics/ ) { + if ( file_no_doc_changed =~ /forecastoperator.c|anomalywindowoperator.c|tsim\/analytics|tdgpt_cases.task/ ) { sh ''' cd ${WKC}/tests/parallel_test export DEFAULT_RETRY_TIME=2 diff --git a/tests/parallel_test/tdgpt_cases.task b/tests/parallel_test/tdgpt_cases.task index 015f2a005a..bb3c15f307 100644 --- a/tests/parallel_test/tdgpt_cases.task +++ b/tests/parallel_test/tdgpt_cases.task @@ -3,4 +3,4 @@ #NA,NA,y or n,script,./test.sh -f tsim/analytics/basic0.sim #tdgpt-test -,,y,script,./test.sh -f tsim/analytics/basic0.sim \ No newline at end of file +,,y,script,./test.sh -f tsim/analytics/basic0.sim From 52c87f5b5b2566a574f0149ab0bc490cf0818465 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 14:45:12 +0800 Subject: [PATCH 17/26] ci: set test step in ci when tdgpt file changed --- Jenkinsfile2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 85683a6350..63ebf3a6ed 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -574,7 +574,7 @@ pipeline { cd ${WKC}/tests/parallel_test export DEFAULT_RETRY_TIME=2 date - ''' + timeout_cmd + ''' time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 1200 ''' + extra_param + ''' + timeout 600 time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 300 ''' + extra_param + ''' ''' } if ( file_only_tdgpt_change_except != '' ) { From 779b97e29174bf0172aa267b67d267bb5bb61918 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 14:49:37 +0800 Subject: [PATCH 18/26] ci: set test step in ci when tdgpt file changed --- tests/parallel_test/tdgpt_cases.task | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/tdgpt_cases.task b/tests/parallel_test/tdgpt_cases.task index bb3c15f307..41a9c3b356 100644 --- a/tests/parallel_test/tdgpt_cases.task +++ b/tests/parallel_test/tdgpt_cases.task @@ -3,4 +3,4 @@ #NA,NA,y or n,script,./test.sh -f tsim/analytics/basic0.sim #tdgpt-test -,,y,script,./test.sh -f tsim/analytics/basic0.sim +,,n,script,./test.sh -f tsim/analytics/basic0.sim From ca5604633d832cd45a3a8d40af1548b3d52c608e Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 19:28:27 +0800 Subject: [PATCH 19/26] ci: add test case for tdgpt --- tests/system-test/9-tdgpt/test_gpt.py | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 tests/system-test/9-tdgpt/test_gpt.py diff --git a/tests/system-test/9-tdgpt/test_gpt.py b/tests/system-test/9-tdgpt/test_gpt.py new file mode 100644 index 0000000000..099003dbdd --- /dev/null +++ b/tests/system-test/9-tdgpt/test_gpt.py @@ -0,0 +1,65 @@ +from util.log import * +from util.cases import * +from util.sql import * +from util.common import * +import taos + + + +class TDTestCase: + clientCfgDict = {'debugFlag': 135} + updatecfgDict = { + "debugFlag" : "135", + "queryBufferSize" : 10240, + 'clientCfg' : clientCfgDict + } + + def init(self, conn, logSql, replicaVal=1): + self.replicaVar = int(replicaVal) + tdLog.debug(f"start to excute {__file__}") + self.conn = conn + tdSql.init(conn.cursor(), False) + self.passwd = {'root':'taosdata', + 'test':'test'} + + def prepare_anode_data(self): + tdSql.execute(f"create anode '127.0.0.1:6090'") + tdSql.execute(f"create database db_gpt") + tdSql.execute(f"create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned);") + tdSql.execute(f"create table ct1 using stb tags(1000);") + tdSql.execute(f"insert into ct1(ts, c1) values(now-1a, 5)(now+1a, 14)(now+2a, 15)(now+3a, 15)(now+4a, 14);") + tdSql.execute(f"insert into ct1(ts, c1) values(now+5a, 19)(now+6a, 17)(now+7a, 16)(now+8a, 20)(now+9a, 22);") + tdSql.execute(f"insert into ct1(ts, c1) values(now+10a, 8)(now+11a, 21)(now+12a, 28)(now+13a, 11)(now+14a, 9);") + tdSql.execute(f"insert into ct1(ts, c1) values(now+15a, 29)(now+16a, 40);") + + + def test_forecast(self): + """ + Test forecast + """ + tdLog.info(f"Test forecast") + tdSql.query(f"SELECT _frowts, FORECAST(c1, \"algo=arima,alpha=95,period=10,start_p=1,max_p=5,start_q=1,max_q=5,d=1\") from ct1 ;") + + + def test_anomaly_window(self, uname): + """ + Test anomaly window + """ + tdLog.info(f"Test anomaly window") + tdSql.query(f"SELECT _wstart, _wend, SUM(c1) FROM ct1 ANOMALY_WINDOW(c1, \"algo=iqr\");") + + def run(self): + self.prepare_anode_data() + self.test_forecast() + self.test_anomaly_window() + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) + + + + From f840db1e966a9b6d2fa1d9b38a10fbee43cb06da Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 19:36:24 +0800 Subject: [PATCH 20/26] ci: add test case for tdgpt --- tests/system-test/9-tdgpt/test_gpt.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/system-test/9-tdgpt/test_gpt.py b/tests/system-test/9-tdgpt/test_gpt.py index 099003dbdd..662e64dc7e 100644 --- a/tests/system-test/9-tdgpt/test_gpt.py +++ b/tests/system-test/9-tdgpt/test_gpt.py @@ -25,12 +25,12 @@ class TDTestCase: def prepare_anode_data(self): tdSql.execute(f"create anode '127.0.0.1:6090'") tdSql.execute(f"create database db_gpt") - tdSql.execute(f"create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned);") - tdSql.execute(f"create table ct1 using stb tags(1000);") - tdSql.execute(f"insert into ct1(ts, c1) values(now-1a, 5)(now+1a, 14)(now+2a, 15)(now+3a, 15)(now+4a, 14);") - tdSql.execute(f"insert into ct1(ts, c1) values(now+5a, 19)(now+6a, 17)(now+7a, 16)(now+8a, 20)(now+9a, 22);") - tdSql.execute(f"insert into ct1(ts, c1) values(now+10a, 8)(now+11a, 21)(now+12a, 28)(now+13a, 11)(now+14a, 9);") - tdSql.execute(f"insert into ct1(ts, c1) values(now+15a, 29)(now+16a, 40);") + tdSql.execute(f"create table if not exists db_gpt.stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned);") + tdSql.execute(f"create table db_gpt.ct1 using db_gpt.stb tags(1000);") + tdSql.execute(f"insert into db_gpt.ct1(ts, c1) values(now-1a, 5)(now+1a, 14)(now+2a, 15)(now+3a, 15)(now+4a, 14);") + tdSql.execute(f"insert into db_gpt.ct1(ts, c1) values(now+5a, 19)(now+6a, 17)(now+7a, 16)(now+8a, 20)(now+9a, 22);") + tdSql.execute(f"insert into db_gpt.ct1(ts, c1) values(now+10a, 8)(now+11a, 21)(now+12a, 28)(now+13a, 11)(now+14a, 9);") + tdSql.execute(f"insert into db_gpt.ct1(ts, c1) values(now+15a, 29)(now+16a, 40);") def test_forecast(self): @@ -38,7 +38,7 @@ class TDTestCase: Test forecast """ tdLog.info(f"Test forecast") - tdSql.query(f"SELECT _frowts, FORECAST(c1, \"algo=arima,alpha=95,period=10,start_p=1,max_p=5,start_q=1,max_q=5,d=1\") from ct1 ;") + tdSql.query(f"SELECT _frowts, FORECAST(c1, \"algo=arima,alpha=95,period=10,start_p=1,max_p=5,start_q=1,max_q=5,d=1\") from db_gpt.ct1 ;") def test_anomaly_window(self, uname): @@ -46,7 +46,7 @@ class TDTestCase: Test anomaly window """ tdLog.info(f"Test anomaly window") - tdSql.query(f"SELECT _wstart, _wend, SUM(c1) FROM ct1 ANOMALY_WINDOW(c1, \"algo=iqr\");") + tdSql.query(f"SELECT _wstart, _wend, SUM(c1) FROM db_gpt.ct1 ANOMALY_WINDOW(c1, \"algo=iqr\");") def run(self): self.prepare_anode_data() From 160e65306b07441e8167b1f3cd7fe85c67a10f5d Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 19:39:30 +0800 Subject: [PATCH 21/26] ci: add test case for tdgpt --- tests/system-test/9-tdgpt/test_gpt.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/system-test/9-tdgpt/test_gpt.py b/tests/system-test/9-tdgpt/test_gpt.py index 662e64dc7e..16ab6bb22f 100644 --- a/tests/system-test/9-tdgpt/test_gpt.py +++ b/tests/system-test/9-tdgpt/test_gpt.py @@ -39,14 +39,16 @@ class TDTestCase: """ tdLog.info(f"Test forecast") tdSql.query(f"SELECT _frowts, FORECAST(c1, \"algo=arima,alpha=95,period=10,start_p=1,max_p=5,start_q=1,max_q=5,d=1\") from db_gpt.ct1 ;") + tdSql.checkRows(10) - - def test_anomaly_window(self, uname): + def test_anomaly_window(self): """ Test anomaly window """ tdLog.info(f"Test anomaly window") tdSql.query(f"SELECT _wstart, _wend, SUM(c1) FROM db_gpt.ct1 ANOMALY_WINDOW(c1, \"algo=iqr\");") + tdSql.checkData(0,2,40) + def run(self): self.prepare_anode_data() From c511979c9e96aa1588830099c607a685023a1d46 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 20:27:30 +0800 Subject: [PATCH 22/26] ci: add test case for tdgpt --- packaging/smokeTest/test_server_tdgpt.py | 134 +++++++++++++++++++++ packaging/smokeTest/test_server_unix_tdgpt | 2 + 2 files changed, 136 insertions(+) create mode 100644 packaging/smokeTest/test_server_tdgpt.py create mode 100644 packaging/smokeTest/test_server_unix_tdgpt diff --git a/packaging/smokeTest/test_server_tdgpt.py b/packaging/smokeTest/test_server_tdgpt.py new file mode 100644 index 0000000000..a97a2c6650 --- /dev/null +++ b/packaging/smokeTest/test_server_tdgpt.py @@ -0,0 +1,134 @@ +import pytest +import subprocess +import os +from versionCheckAndUninstallforPytest import UninstallTaos +import platform +import re +import time +import signal +import logging + + + +system = platform.system() +current_path = os.path.abspath(os.path.dirname(__file__)) + +with open("%s/test_server_unix_tdgpt" % current_path) as f: + cases = f.read().splitlines() + +OEM = ["ProDB"] + + +@pytest.fixture(scope="module") +def get_config(request): + verMode = request.config.getoption("--verMode") + taosVersion = request.config.getoption("--tVersion") + baseVersion = request.config.getoption("--baseVersion") + sourcePath = request.config.getoption("--sourcePath") + config = { + "verMode": verMode, + "taosVersion": taosVersion, + "baseVersion": baseVersion, + "sourcePath": sourcePath, + "system": platform.system(), + "arch": platform.machine() + } + return config + + +@pytest.fixture(scope="module") +def setup_module(get_config): + def run_cmd(command): + print("CMD:", command) + result = subprocess.run(command, capture_output=True, text=True, shell=True) + print("STDOUT:", result.stdout) + print("STDERR:", result.stderr) + print("Return Code:", result.returncode) + assert result.returncode == 0 + return result + + # setup before module tests + config = get_config + if config["system"] == "Windows": + cmd = r"mkdir ..\..\debug\build\bin" + else: + cmd = "mkdir -p ../../debug/build/bin/" + subprocess.getoutput(cmd) + if config["system"] == "Linux" or config["system"] == "Darwin" : # add tmq_sim + cmd = "cp -rf ../../../debug/build/bin/tmq_sim ../../debug/build/bin/." + subprocess.getoutput(cmd) + if config["system"] == "Darwin": + cmd = "sudo cp -rf /usr/local/bin/taos* ../../debug/build/bin/" + elif config["system"] == "Windows": + cmd = r"xcopy C:\TDengine\taos*.exe ..\..\debug\build\bin /Y" + else: + if config["baseVersion"] in OEM: + cmd = '''sudo find /usr/bin -name 'prodb*' -exec sh -c 'for file; do cp "$file" "../../debug/build/bin/taos${file##/usr/bin/%s}"; done' sh {} +''' % ( + config["baseVersion"].lower()) + else: + cmd = "sudo cp /usr/bin/taos* ../../debug/build/bin/" + run_cmd(cmd) + if config["baseVersion"] in OEM: # mock OEM + cmd = "sed -i 's/taos.cfg/%s.cfg/g' ../../tests/pytest/util/dnodes.py" % config["baseVersion"].lower() + run_cmd(cmd) + cmd = "sed -i 's/taosdlog.0/%sdlog.0/g' ../../tests/pytest/util/dnodes.py" % config["baseVersion"].lower() + run_cmd(cmd) + cmd = "sed -i 's/taos.cfg/%s.cfg/g' ../../tests/army/frame/server/dnode.py" % config["baseVersion"].lower() + run_cmd(cmd) + cmd = "sed -i 's/taosdlog.0/%sdlog.0/g' ../../tests/army/frame/server/dnode.py" % config["baseVersion"].lower() + run_cmd(cmd) + cmd = "ln -s /usr/bin/prodb /usr/local/bin/taos" + subprocess.getoutput(cmd) + + # yield + # + # name = "taos" + # if config["baseVersion"] in OEM: + # name = config["baseVersion"].lower() + # subprocess.getoutput("rm /usr/local/bin/taos") + # subprocess.getoutput("pkill taosd") + # UninstallTaos(config["taosVersion"], config["verMode"], True, name) + + +# use pytest fixture to exec case +@pytest.fixture(params=cases) +def run_command(request): + commands = request.param + if commands.strip().startswith("#"): + pytest.skip("This case has been marked as skipped") + d, command = commands.strip().split(",") + if system == "Windows": + cmd = r"cd %s\..\..\tests\%s && %s" % (current_path, d, command) + else: + cmd = "cd %s/../../tests/%s&&sudo %s" % (current_path, d, command) + print(cmd) + result = subprocess.run(cmd, capture_output=True, text=True, shell=True) + return { + "command": command, + "stdout": result.stdout, + "stderr": result.stderr, + "returncode": result.returncode + } + + +class TestServer: + + @pytest.mark.all + def test_execute_cases(self, setup_module, run_command): + # assert the result + if run_command['returncode'] != 0: + print(f"Running command: {run_command['command']}") + print("STDOUT:", run_command['stdout']) + print("STDERR:", run_command['stderr']) + print("Return Code:", run_command['returncode']) + else: + print(f"Running command: {run_command['command']}") + if len(run_command['stdout']) > 1000: + print("STDOUT:", run_command['stdout'][:1000] + "...") + else: + print("STDOUT:", run_command['stdout']) + print("STDERR:", run_command['stderr']) + print("Return Code:", run_command['returncode']) + + assert run_command[ + 'returncode'] == 0, f"Command '{run_command['command']}' failed with return code {run_command['returncode']}" diff --git a/packaging/smokeTest/test_server_unix_tdgpt b/packaging/smokeTest/test_server_unix_tdgpt new file mode 100644 index 0000000000..248e5205b6 --- /dev/null +++ b/packaging/smokeTest/test_server_unix_tdgpt @@ -0,0 +1,2 @@ +system-test,python3 ./test.py -f 9-tdgpt/test_gpt.py + From 990a01788305500bcd052b795d794b43f73a5361 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 20:38:09 +0800 Subject: [PATCH 23/26] ci: add test case for tdgpt --- packaging/smokeTest/{test_server_tdgpt.py => test_anode.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packaging/smokeTest/{test_server_tdgpt.py => test_anode.py} (100%) diff --git a/packaging/smokeTest/test_server_tdgpt.py b/packaging/smokeTest/test_anode.py similarity index 100% rename from packaging/smokeTest/test_server_tdgpt.py rename to packaging/smokeTest/test_anode.py From 9a23d34437bb2a17460c54540997c6b88c1cdcd7 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 27 Nov 2024 22:01:22 +0800 Subject: [PATCH 24/26] ci: add test case for tdgpt --- packaging/smokeTest/test_server_unix_tdgpt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packaging/smokeTest/test_server_unix_tdgpt b/packaging/smokeTest/test_server_unix_tdgpt index 248e5205b6..6d099d6d02 100644 --- a/packaging/smokeTest/test_server_unix_tdgpt +++ b/packaging/smokeTest/test_server_unix_tdgpt @@ -1,2 +1 @@ -system-test,python3 ./test.py -f 9-tdgpt/test_gpt.py - +system-test,python3 ./test.py -f 9-tdgpt/test_gpt.py \ No newline at end of file From 4fcb3a86894ed0d2040e20651caa9ab14a1a0c41 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Thu, 28 Nov 2024 11:36:54 +0800 Subject: [PATCH 25/26] ci: add test case for tdgpt --- tests/parallel_test/tdgpt_cases.task | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/parallel_test/tdgpt_cases.task b/tests/parallel_test/tdgpt_cases.task index 41a9c3b356..82911ed100 100644 --- a/tests/parallel_test/tdgpt_cases.task +++ b/tests/parallel_test/tdgpt_cases.task @@ -4,3 +4,5 @@ #tdgpt-test ,,n,script,./test.sh -f tsim/analytics/basic0.sim +,,n,system-test,python3 ./test.py -f 9-tdgpt/test_gpt.py + From c23dcd10acf50a216d1ea310518c5ff9cb625b24 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Thu, 28 Nov 2024 11:46:11 +0800 Subject: [PATCH 26/26] ci: add test case for tdgpt --- tests/parallel_test/tdgpt_cases.task | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/tdgpt_cases.task b/tests/parallel_test/tdgpt_cases.task index 82911ed100..69123f4aac 100644 --- a/tests/parallel_test/tdgpt_cases.task +++ b/tests/parallel_test/tdgpt_cases.task @@ -4,5 +4,5 @@ #tdgpt-test ,,n,script,./test.sh -f tsim/analytics/basic0.sim -,,n,system-test,python3 ./test.py -f 9-tdgpt/test_gpt.py +#,,n,system-test,python3 ./test.py -f 9-tdgpt/test_gpt.py