<HTML><BODY><div><div><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).</div><div> </div><div>Closes #5003<br>---</div><div> </div><div>Github: <a href="https://github.com/tarantool/tarantool/tree/opiskunov/gh-5003-perf-images-cleanup">https://github.com/tarantool/tarantool/tree/opiskunov/gh-5003-perf-images-cleanup</a><br>Issue: <a href="https://github.com/tarantool/tarantool/issues/5003">https://github.com/tarantool/tarantool/issues/5003</a><br><br> .gitlab-ci.yml | 31 ++++++++++++++++++++++++++++---<br> .gitlab.mk | 4 ++++</div><div> 2 files changed, 32 insertions(+), 3 deletions(-)</div><div> </div><div>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</div><div> </div><div> # Testing part</div><div> </div><div>@@ -255,12 +257,35 @@ perf_linkbench_ssd:</div><div> </div><div> # Post-testing part</div><div> </div><div>-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</div><div> </div><div>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</div><div> </div><div>+# 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></BODY></HTML>