diff --git a/Jenkinsfile b/Jenkinsfile index dde389f..1c43812 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -143,18 +143,12 @@ pipeline { call C:\\Instrument\\Apps\\EPICS\\swap_galil.bat NEW ) call clean_files.bat - @echo FIRST PART OF TESTS STARTED - call run_tests.bat - set errcode1=%errorlevel% - if %errcode1% NEQ 0 ( - @echo ERROR: FIRST PART OF TESTS FAILED WITH CODE %errcode1% - ) else ( - @echo OK: FIRST PART OF TESTS SUCCEEDED - ) + @echo SECOND PART OF TESTS STARTED @echo Running IOC tests on node ${env.NODE_NAME} pushd "C:\\Instrument\\Apps\\EPICS" call config_env.bat + python -m pip install git+https://github.com/ISISComputingGroup/lewis@c79836a93d62b93a5a43a3398d664b246e975b31 REM make will usually stop on first test failure as python will return an error. We can pass -i to make to ignore REM this and we will still usually see a problem as the python unittest XML output will list it, but we miss REM the case when python crashes with no XML output. So we will try using -k which looks to "keep going"