diff --git a/Jenkinsfile b/Jenkinsfile index 5f1311d9435efc09b33704bf869f2ad5a7919092..b52c34628cda68d3e94c2e66a17cdedf64a12d6b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -144,7 +144,7 @@ def pre_test_win(){ bat''' cd C:\\workspace\\TDinternal\\community git pull - git fetch origin +refs/pull/${CHANGE_ID}/merge + git fetch origin +refs/pull/%CHANGE_ID%/merge git checkout -qf FETCH_HEAD git clean -dfx cd C:\\workspace\\TDinternal @@ -182,9 +182,10 @@ def pre_test_win(){ cmake ../ -G "NMake Makefiles" nmake nmake install + xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 cd C:\\workspace\\TDinternal\\community\\src\\connector\\python python -m pip install . - xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 + ''' return 1 } @@ -467,7 +468,7 @@ pipeline { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { bat''' cd C:\\workspace\\TDinternal\\community\\tests\\pytest - test-all.bat Wintest + .\\test-all.bat Wintest ''' } script{ diff --git a/tests/pytest/test-all.bat b/tests/pytest/test-all.bat index 1f1e2c1727527e91f7632213992607d6221eac85..31c69e9c955139c6808da045fbe8c875bb7b338a 100644 --- a/tests/pytest/test-all.bat +++ b/tests/pytest/test-all.bat @@ -7,7 +7,6 @@ for /F "usebackq tokens=*" %%i in (fulltest.bat) do ( if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) ) exit - :colorEcho echo off "%~2"