From 9e30aef1921dd05100e2226d96858e23c61ccd2a Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Fri, 2 Aug 2024 16:54:54 +0800 Subject: [PATCH] test: scan returned values in ci --- Jenkinsfile2 | 6 +++--- tests/ci/scan_file_path.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index de96a23d51..a4f765c9fb 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -137,7 +137,7 @@ def pre_test(){ ''' } else { sh ''' - echo "unmatched reposiotry ${CHANGE_URL}" + echo "unmatched repository ${CHANGE_URL}" ''' } sh ''' @@ -247,7 +247,7 @@ def pre_test_win(){ ''' } else { bat ''' - echo "unmatched reposiotry %CHANGE_URL%" + echo "unmatched repository %CHANGE_URL%" ''' } } @@ -309,7 +309,7 @@ def pre_test_build_win() { python -m pip install taospy==2.7.13 python -m pip uninstall taos-ws-py -y python -m pip install taos-ws-py==0.3.1 - xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 + xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 ''' return 1 } diff --git a/tests/ci/scan_file_path.py b/tests/ci/scan_file_path.py index f4cf25b8f7..03f2d6ee4f 100644 --- a/tests/ci/scan_file_path.py +++ b/tests/ci/scan_file_path.py @@ -62,7 +62,7 @@ log_file_path = f"{work_path}/scan_log/scan_{branch_name}_{current_time}/" os.makedirs(log_file_path, exist_ok=True) -scan_log_file = f"{log_file_path}/scan.log" +scan_log_file = f"{log_file_path}/scan_log.txt" logger.add(scan_log_file, rotation="10MB", retention="7 days", level="DEBUG") #if error happens, open this to debug # print(self_path,work_path,TD_project_path,log_file_path,change_file_list) @@ -212,8 +212,8 @@ if __name__ == "__main__": # for item in res: # data += item[0] + "," + str(item[1]) + "\n" # logger.info("Csv data: %s" % data) - write_csv(os.path.join(log_file_path, "scan_res.csv"), res) - scan_result_log = f"{log_file_path}/scan_res.csv" + write_csv(os.path.join(log_file_path, "scan_res.txt"), res) + scan_result_log = f"{log_file_path}/scan_res.txt" # delete the first element of res res= res[1:] logger.info("The result of scan: \n")