<HTML><BODY><div><div>Sasha, thanks for review. <br> </div><div>I will modify patch as you suggested.</div><div> </div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Среда, 20 мая 2020, 19:44 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:<br> <div id=""><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15899930940171421384_BODY">Hi Oleg, thanks for the patch, in general LGTM, just single nit comments:<br><br>1) You have 2 targets making the same:<br><br> # Remove temporary performance image from the test host<br> perf_cleanup: perf_clone_benchs_repo<br> make -f bench-run/targets.mk cleanup<br><br> # Remove temporary performance image after bootstrap phase<br> perf_cleanup_bootstrap:<br> make -f bench-run/targets.mk cleanup<br><br>may be its better not to duplicate the code and use the single code:<br><br> # Remove temporary performance image after bootstrap phase<br> perf_cleanup_bootstrap:<br> make -f bench-run/targets.mk cleanup<br><br> # Remove temporary performance image from the test host<br> perf_cleanup: perf_clone_benchs_repo perf_cleanup_bootstrap<br><br>2) in gitlab-ci YAMl file for common parts of code better to use<br>templates, like:<br><br> .perf_cleanup_definition: &perf_cleanup_definition<br> <<: *perf_only_definition<br> stage: cleanup<br> script:<br> - ${GITLAB_MAKE} perf_cleanup<br><br>in this way jobs will be like:<br><br> remove_images_sh2:<br> <<: *perf_cleanup_definition<br> tags:<br> - sh2_shell<br><br>On Wed, May 20, 2020 at 03:36:37AM +0300, Oleg Piskunov wrote:<div class="mail-quote-collapse">><br>><br>> - add cleanup after perf docker<br>> image preparation (perf_bootstrap job).<br>> - cleanup perf docker images on execution hosts<br>> after perf testing (cleanup stage).<br>> <br>> Closes #5003<br>> ---<br>> <br>> Github: <a href="https://github.com/tarantool/tarantool/tree/opiskunov/gh-5003-perf-images-cleanup" target="_blank">https://github.com/tarantool/tarantool/tree/opiskunov/gh-5003-perf-images-cleanup</a><br>> Issue: <a href="https://github.com/tarantool/tarantool/issues/5003" target="_blank">https://github.com/tarantool/tarantool/issues/5003</a><br>><br>> .gitlab-ci.yml | 31 ++++++++++++++++++++++++++++---<br>> .gitlab.mk | 4 ++++<br>> 2 files changed, 32 insertions(+), 3 deletions(-)<br>> <br>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>> index 256b368..4c1fa0b 100644<br>> --- a/.gitlab-ci.yml<br>> +++ b/.gitlab-ci.yml<br>> @@ -196,6 +196,8 @@ perf_bootstrap:<br>> - perf<br>> script:<br>> - ${GITLAB_MAKE} perf_prepare<br>> + after_script:<br>> + - ${GITLAB_MAKE} perf_cleanup_bootstrap<br>> <br>> # Testing part<br>> <br>> @@ -255,12 +257,35 @@ perf_linkbench_ssd:<br>> <br>> # Post-testing part<br>> <br>> -remove_images:<br>> +remove_images_sh1:<br>> <<: *perf_only_definition<br>> stage: cleanup<br>> - when: always<br>> tags:<br>> - - perf<br>> + - sh1_shell<br>> + script:<br>> + - ${GITLAB_MAKE} perf_cleanup<br>> +<br>> +remove_images_sh2:<br>> + <<: *perf_only_definition<br>> + stage: cleanup<br>> + tags:<br>> + - sh2_shell<br>> + script:<br>> + - ${GITLAB_MAKE} perf_cleanup<br>> +<br>> +remove_images_sh3:<br>> + <<: *perf_only_definition<br>> + stage: cleanup<br>> + tags:<br>> + - sh3_shell<br>> + script:<br>> + - ${GITLAB_MAKE} perf_cleanup<br>> +<br>> +remove_images_sh9:<br>> + <<: *perf_only_definition<br>> + stage: cleanup<br>> + tags:<br>> + - sh9_shell<br>> script:<br>> - ${GITLAB_MAKE} perf_cleanup<br>> <br>> diff --git a/.gitlab.mk b/.gitlab.mk<br>> index d1d93cd..feff3f9 100644<br>> --- a/.gitlab.mk<br>> +++ b/.gitlab.mk<br>> @@ -90,6 +90,10 @@ perf_prepare: perf_clone_benchs_repo<br>> perf_cleanup: perf_clone_benchs_repo<br>> make -f bench-run/targets.mk cleanup<br>> <br>> +# Remove temporary performance image after bootstrap phase<br>> +perf_cleanup_bootstrap:<br>> + make -f bench-run/targets.mk cleanup<br>> +<br>> # #################################<br>> # Run tests under a virtual machine<br>> # #################################<br>> --<br>> 1.8.3.1<br>> </div></div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Oleg Piskunov</div></div></div><div> </div></div></BODY></HTML>