From 7ecc216762b30d9a8485e00a3792ac7583ac6559 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 14 Sep 2021 15:02:47 +0800 Subject: [PATCH] update jenkins --- Jenkinsfile | 6 +++--- tests/pytest/test-all.bat | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ce1ef0f5c..dfe9970892 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -117,7 +117,7 @@ def pre_test_win(){ cd C:\\workspace\\TDinternal rd /s /Q C:\\workspace\\TDinternal\\debug cd C:\\workspace\\TDinternal\\community - git reset --hard HEAD~10 >/dev/null + git reset --hard HEAD~10 ''' script { if (env.CHANGE_TARGET == 'master') { @@ -138,7 +138,7 @@ def pre_test_win(){ } bat''' cd C:\\workspace\\TDinternal\\community - git pull >/dev/null + git pull git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git clean -dfx @@ -164,7 +164,7 @@ def pre_test_win(){ } bat ''' cd C:\\workspace\\TDinternal - git pull >/dev/null + git pull export TZ=Asia/Harbin date diff --git a/tests/pytest/test-all.bat b/tests/pytest/test-all.bat index 9748d58275..dd3ef92535 100644 --- a/tests/pytest/test-all.bat +++ b/tests/pytest/test-all.bat @@ -4,7 +4,7 @@ for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1) for /F "usebackq tokens=*" %%i in (fulltest.bat) do ( echo Processing %%i call %%i ARG1 -w 1 -m %1 > result.txt 2>error.txt - if errorlevel 1 ( call :colorEcho 0c "failed" &echo. ) else ( call :colorEcho 0a "Success" &echo. ) + if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit /b ) else ( call :colorEcho 0a "Success" &echo. ) ) exit -- GitLab