diff --git a/Jenkinsfile b/Jenkinsfile index b52c34628cda68d3e94c2e66a17cdedf64a12d6b..b01497ead3165a0463b135e5389e65198a89ac48 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -464,8 +464,9 @@ pipeline { stage('test'){ agent{label "win"} steps{ - pre_test_win() + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + pre_test_win() bat''' cd C:\\workspace\\TDinternal\\community\\tests\\pytest .\\test-all.bat Wintest diff --git a/tests/pytest/test-all.bat b/tests/pytest/test-all.bat index 31c69e9c955139c6808da045fbe8c875bb7b338a..1f1e2c1727527e91f7632213992607d6221eac85 100644 --- a/tests/pytest/test-all.bat +++ b/tests/pytest/test-all.bat @@ -7,6 +7,7 @@ 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"