From 69598c93e5b0454ef107cb88aa554c555772ccc7 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 8 Oct 2021 06:38:32 +0000 Subject: [PATCH] update --- Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 24955aa8e7..56227bf0dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,6 +114,7 @@ def pre_test(){ } def pre_test_win(){ bat ''' + taskkill /f /t /im python.exe cd C:\\ rd /s /Q C:\\TDengine cd C:\\workspace\\TDinternal @@ -179,9 +180,9 @@ def pre_test_win(){ mkdir debug cd debug call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64 - cmake ../ -G "NMake Makefiles" && exit 8 - nmake && exit 8 - nmake install && exit 8 + cmake ../ -G "NMake Makefiles" + nmake || exit 8 + nmake install || exit 8 xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 && exit 8 cd C:\\workspace\\TDinternal\\community\\src\\connector\\python python -m pip install . @@ -484,10 +485,12 @@ pipeline { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { pre_test_win() + timeout(time: 20, unit: 'MINUTES'){ bat''' cd C:\\workspace\\TDinternal\\community\\tests\\pytest .\\test-all.bat Wintest ''' + } } script{ win_stop=1 -- GitLab