<HTML><BODY><div><div>Sasha, thanks for review.</div><div>I will add specific tag for sh3 — «docker_sh3_perf»</div><div> </div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Среда, 13 мая 2020, 21:48 +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_15893957131570320375_BODY">Hi Oleg, thanks for the patch. As I see you set the 2 new names for the<br>new tags, it ok. But you removed the default name from template and set<br>the rest tag with its default name, I think it's better to set this tag<br>in the new style, like docker_sh3_perf, otherwise better to avoid of<br>removement of the default value from template, and in this way no need<br>to set it manually to depend jobs. After this correction (choose any of<br>two described above) LGTM.<br><br>On Fri, May 08, 2020 at 11:58:04AM +0300, Oleg Piskunov wrote:<div class="mail-quote-collapse">><br>><br>> - Adding 2 servers (sh1, sh2) for performance testing.<br>> Additional gitlab-ci tags for perf testing:<br>> docker_sh1_perf and docker_sh2_perf.<br>> - Rebalance performance testing between servers.<br>> - Changing gitlab-ci tag for performance docker images<br>> from 'perf' to 'deploy'.<br>> <br>> Closes #4868<br>> ---<br>> <br>> Github: <a href="https://github.com/tarantool/tarantool/tree/opiskunov/gh-4868-parallel-perf" target="_blank">https://github.com/tarantool/tarantool/tree/opiskunov/gh-4868-parallel-perf</a><br>> Issue: <a href="https://github.com/tarantool/tarantool/issues/4868" target="_blank">https://github.com/tarantool/tarantool/issues/4868</a><br>> <br>> .gitlab-ci.yml | 18 +++++++++++++++---<br>> 1 file changed, 15 insertions(+), 3 deletions(-)<br>> <br>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>> index ae2afce..897f657 100644<br>> --- a/.gitlab-ci.yml<br>> +++ b/.gitlab-ci.yml<br>> @@ -91,8 +91,6 @@ variables:<br>> <<: *perf_only_definition<br>> image: ${IMAGE_PERF_BUILT}<br>> stage: perf<br>> - tags:<br>> - - docker_perf<br>> artifacts:<br>> when: always<br>> paths:<br>> @@ -195,7 +193,7 @@ perf_bootstrap:<br>> <<: *perf_only_definition<br>> stage: test<br>> tags:<br>> - - perf<br>> + - deploy<br>> script:<br>> - ${GITLAB_MAKE} perf_prepare<br>> <br>> @@ -203,18 +201,24 @@ perf_bootstrap:<br>> <br>> perf_sysbench:<br>> <<: *perf_docker_test_definition<br>> + tags:<br>> + - docker_perf<br>> variables:<br>> <<: *perf_vars_definition<br>> BENCH: 'sysbench'<br>> <br>> perf_tpcc:<br>> <<: *perf_docker_test_definition<br>> + tags:<br>> + - docker_perf<br>> variables:<br>> <<: *perf_vars_definition<br>> BENCH: 'tpcc'<br>> <br>> perf_ycsb_hash:<br>> <<: *perf_docker_test_definition<br>> + tags:<br>> + - docker_sh2_perf<br>> variables:<br>> <<: *perf_vars_definition<br>> BENCH: 'ycsb'<br>> @@ -222,6 +226,8 @@ perf_ycsb_hash:<br>> <br>> perf_ycsb_tree:<br>> <<: *perf_docker_test_definition<br>> + tags:<br>> + - docker_sh2_perf<br>> variables:<br>> <<: *perf_vars_definition<br>> BENCH: 'ycsb'<br>> @@ -229,6 +235,8 @@ perf_ycsb_tree:<br>> <br>> perf_nosqlbench_hash:<br>> <<: *perf_docker_test_definition<br>> + tags:<br>> + - docker_sh1_perf<br>> variables:<br>> <<: *perf_vars_definition<br>> BENCH: 'nosqlbench'<br>> @@ -236,6 +244,8 @@ perf_nosqlbench_hash:<br>> <br>> perf_nosqlbench_tree:<br>> <<: *perf_docker_test_definition<br>> + tags:<br>> + - docker_sh1_perf<br>> variables:<br>> <<: *perf_vars_definition<br>> BENCH: 'nosqlbench'<br>> @@ -243,6 +253,8 @@ perf_nosqlbench_tree:<br>> <br>> perf_cbench:<br>> <<: *perf_docker_test_definition<br>> + tags:<br>> + - docker_sh2_perf<br>> variables:<br>> <<: *perf_vars_definition<br>> BENCH: 'cbench'<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>