From 8194616169769b0b6505dd803408008cfef376be Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 24 Mar 2023 13:18:56 +0000 Subject: [PATCH 01/13] Run under debugger --- run_tests.bat | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/run_tests.bat b/run_tests.bat index 8d69749..7b0c94a 100644 --- a/run_tests.bat +++ b/run_tests.bat @@ -1,12 +1,24 @@ setlocal call create_virtual_env.bat call %EPICS_ROOT%\stop_ibex_server.bat -python test_setup_teardown.py>base_line_memory.txt +"%PYTHON3%" test_setup_teardown.py>base_line_memory.txt set /P BASE_MEMORY_USAGE= Date: Fri, 24 Mar 2023 22:51:27 +0000 Subject: [PATCH 02/13] Update run_tests.bat --- run_tests.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/run_tests.bat b/run_tests.bat index 7b0c94a..6d1b405 100644 --- a/run_tests.bat +++ b/run_tests.bat @@ -11,11 +11,13 @@ for /D %%I in ( "C:\Program Files (x86)\Windows Kits\*" ) do ( if exist "%%I\Debuggers\x64\windbg.exe" SET "WINDBG=%%I\Debuggers\x64\windbg.exe" ) +REM disable windbg as non-interactive jenkins if not "%WINDBG%" == "" ( REM we use the python3 executable rather than python as this allows us to REM configure the applicatrion verifier for python3.exe and we don't get REM a lot of logs every time tests spawn python.exe for e.g. emulators - "%WINDBG%" -g -xd av -xd ch -xd sov "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* + REM "%WINDBG%" -g -xd av -xd ch -xd sov "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* + "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* ) else ( "%PYTHON3%" -u "%~dp0run_tests.py" %* ) From 18216a8e0585ac15a5771aa5d7a2079a20b5f717 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 24 Mar 2023 23:07:23 +0000 Subject: [PATCH 03/13] Use cdb rather than windbg --- run_tests.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run_tests.bat b/run_tests.bat index 6d1b405..37cd234 100644 --- a/run_tests.bat +++ b/run_tests.bat @@ -7,8 +7,9 @@ call %EPICS_ROOT%\start_ibex_server.bat set "PYTHONUNBUFFERED=1" set "exitcode=0" +REM use cdb rather than windbg as jenkins is non interactive for /D %%I in ( "C:\Program Files (x86)\Windows Kits\*" ) do ( - if exist "%%I\Debuggers\x64\windbg.exe" SET "WINDBG=%%I\Debuggers\x64\windbg.exe" + if exist "%%I\Debuggers\x64\cdb.exe" SET "WINDBG=%%I\Debuggers\x64\cdb.exe" ) REM disable windbg as non-interactive jenkins @@ -16,8 +17,7 @@ if not "%WINDBG%" == "" ( REM we use the python3 executable rather than python as this allows us to REM configure the applicatrion verifier for python3.exe and we don't get REM a lot of logs every time tests spawn python.exe for e.g. emulators - REM "%WINDBG%" -g -xd av -xd ch -xd sov "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* - "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* + "%WINDBG%" -g -xd av -xd ch -xd sov "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* ) else ( "%PYTHON3%" -u "%~dp0run_tests.py" %* ) From 81c9077d1d845ed5ccddfd86df014e4deb5e4838 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 31 Mar 2023 18:27:43 +0100 Subject: [PATCH 04/13] Install new genie_python --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1ae9c07..9bbc849 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,6 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps + call \\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\genie_python_3\branches\update_cachannel_epics\BUILD-15\genie_python_install.bat """ } } From 73a0fc0dc87d9943fc8da913ad58faca7534f4d3 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 31 Mar 2023 18:37:41 +0100 Subject: [PATCH 05/13] Double up backslashes --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9bbc849..4501b80 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps - call \\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\genie_python_3\branches\update_cachannel_epics\BUILD-15\genie_python_install.bat + call \\\\isis.cclrc.ac.uk\\inst$\\Kits$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat """ } } From a058c9d559c8aee70fc0f49ae149091c1dc4e81a Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 31 Mar 2023 18:41:47 +0100 Subject: [PATCH 06/13] tabs --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4501b80..c82e385 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps - call \\\\isis.cclrc.ac.uk\\inst$\\Kits$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat + call \\\\isis.cclrc.ac.uk\\inst$\\Kits$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat """ } } @@ -151,8 +151,8 @@ pipeline { pushd "C:\\Instrument\\Apps\\EPICS" call config_env.bat REM make will 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 move back to not using -i for now + 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 move back to not using -i for now make ioctests set errcode2=%errorlevel% popd From 855344ae03a44feeac4727a479b3791f207fe519 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 31 Mar 2023 18:46:25 +0100 Subject: [PATCH 07/13] test --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c82e385..7f83555 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,6 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps - call \\\\isis.cclrc.ac.uk\\inst$\\Kits$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat """ } } From 26c3c6cae47895c342efcd15d1bb3be29196ada5 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 31 Mar 2023 18:47:07 +0100 Subject: [PATCH 08/13] test --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7f83555..2e4bec1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,6 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps + call "\\\\isis.cclrc.ac.uk\\inst$\\Kits$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat" """ } } From fa2f9f642629d87dec91b4d2a0b28b8f4709b011 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 31 Mar 2023 18:48:22 +0100 Subject: [PATCH 09/13] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e4bec1..669a3ca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps - call "\\\\isis.cclrc.ac.uk\\inst$\\Kits$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat" + call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat """ } } From 80a1beb211de7e4867d556e199db020c2cca70e1 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 31 Mar 2023 23:43:55 +0100 Subject: [PATCH 10/13] Do not run under cdb for now --- run_tests.bat | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/run_tests.bat b/run_tests.bat index 37cd234..357b33a 100644 --- a/run_tests.bat +++ b/run_tests.bat @@ -12,14 +12,13 @@ for /D %%I in ( "C:\Program Files (x86)\Windows Kits\*" ) do ( if exist "%%I\Debuggers\x64\cdb.exe" SET "WINDBG=%%I\Debuggers\x64\cdb.exe" ) -REM disable windbg as non-interactive jenkins -if not "%WINDBG%" == "" ( - REM we use the python3 executable rather than python as this allows us to - REM configure the applicatrion verifier for python3.exe and we don't get - REM a lot of logs every time tests spawn python.exe for e.g. emulators +REM we use the python3 executable rather than python as this allows us to +REM configure the applicatrion verifier for python3.exe and we don't get +REM a lot of logs every time tests spawn python.exe for e.g. emulators +if not "%yyyWINDBG%" == "" ( "%WINDBG%" -g -xd av -xd ch -xd sov "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* ) else ( - "%PYTHON3%" -u "%~dp0run_tests.py" %* + "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* ) IF %errorlevel% NEQ 0 ( set exitcode=%errorlevel% From 270c1b4b55bbb2efd555e6c76f3392f13fd84bb4 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 7 Apr 2023 23:13:11 +0100 Subject: [PATCH 11/13] Skip appverifier for moment --- Jenkinsfile | 2 +- run_tests.bat | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea7b0cb..88d7346 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps - call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-15\\genie_python_install.bat + call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-19\\genie_python_install.bat """ } } diff --git a/run_tests.bat b/run_tests.bat index 357b33a..f42d8c8 100644 --- a/run_tests.bat +++ b/run_tests.bat @@ -18,7 +18,8 @@ REM a lot of logs every time tests spawn python.exe for e.g. emulators if not "%yyyWINDBG%" == "" ( "%WINDBG%" -g -xd av -xd ch -xd sov "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* ) else ( - "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* +REM "c:\instrument\Apps\python3\python3.exe" -u "%~dp0run_tests.py" %* + "%PYTHON3%" -u "%~dp0run_tests.py" %* ) IF %errorlevel% NEQ 0 ( set exitcode=%errorlevel% From c5b7f131c6d992212bd00bab9bfc2fd7a080e11e Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Sun, 9 Apr 2023 00:28:56 +0100 Subject: [PATCH 12/13] Update build to 21 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 88d7346..ec2179e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps - call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-19\\genie_python_install.bat + call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-21\\genie_python_install.bat """ } } From 295c8963d35b98d872bd44daa6985a3bee426b4c Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Sun, 9 Apr 2023 01:16:24 +0100 Subject: [PATCH 13/13] build 22 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec2179e..0648214 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,7 @@ pipeline { exit /b 1 ) dir C:\\Instrument\\Apps - call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-21\\genie_python_install.bat + call \\\\isis.cclrc.ac.uk\\inst\$\\Kits\$\\CompGroup\\ICP\\genie_python_3\\branches\\update_cachannel_epics\\BUILD-22\\genie_python_install.bat """ } }