diff --git a/Jenkinsfile b/Jenkinsfile index 25bfb41122bf69295529ffa3152c90ac39ec0e61..0e80576f4887548393bf35c7ba1cc0cb3cda5689 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -124,16 +124,19 @@ def pre_test_win(){ script { if (env.CHANGE_TARGET == 'master') { bat ''' + cd C:\\workspace\\TDinternal\\community git checkout master ''' } else if(env.CHANGE_TARGET == '2.0'){ bat ''' + cd C:\\workspace\\TDinternal\\community git checkout 2.0 ''' } else{ bat ''' + cd C:\\workspace\\TDinternal\\community git checkout develop ''' } @@ -150,16 +153,19 @@ def pre_test_win(){ script { if (env.CHANGE_TARGET == 'master') { bat ''' + cd C:\\workspace\\TDinternal git checkout master ''' } else if(env.CHANGE_TARGET == '2.0'){ bat ''' + cd C:\\workspace\\TDinternal git checkout 2.0 ''' } else{ bat ''' + cd C:\\workspace\\TDinternal git checkout develop ''' } 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"