- Adding 2 servers (sh1, sh2) for performance testing.
- Rebalance performance testing between servers:
  - sh1 (tag: docker_sh1_perf) used for benches:
    nosqlbench_hash, nosqlbench_tree
  - sh2 (tag: docker_sh2_perf) used for benches:
    ycsb_hash, ycsb_tree, cbench
  - sh3 (tag: docker_sh3_perf) used for benches:
    sysbench, tpcc
  - sh9 (tag: docker_perf_ssd) used for benches:
    linkbench_ssd
- Changing gitlab-ci tag for performance docker images
  from 'perf' to 'deploy'.

 

Closes #4868
---

 

Github: https://github.com/tarantool/tarantool/tree/opiskunov/gh-4868-parallel-perf
Issue: https://github.com/tarantool/tarantool/issues/4868

 .gitlab-ci.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7f58b9..fc214ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,8 +91,6 @@ variables:
   <<: *perf_only_definition
   image: ${IMAGE_PERF_BUILT}
   stage: perf
-  tags:
-    - docker_perf
   artifacts:
     when: always
     paths:
@@ -191,7 +189,7 @@ perf_bootstrap:
   <<: *perf_only_definition
   stage: test
   tags:
-    - perf
+    - deploy
   script:
     - ${GITLAB_MAKE} perf_prepare

 

@@ -199,18 +197,24 @@ perf_bootstrap:

 

 perf_sysbench:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh3_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'sysbench'

 

 perf_tpcc:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh3_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'tpcc'

 

 perf_ycsb_hash:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh2_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'ycsb'
@@ -218,6 +222,8 @@ perf_ycsb_hash:

 

 perf_ycsb_tree:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh2_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'ycsb'
@@ -225,6 +231,8 @@ perf_ycsb_tree:

 

 perf_nosqlbench_hash:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh1_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'nosqlbench'
@@ -232,6 +240,8 @@ perf_nosqlbench_hash:

 

 perf_nosqlbench_tree:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh1_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'nosqlbench'
@@ -239,6 +249,8 @@ perf_nosqlbench_tree:

 

 perf_cbench:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh2_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'cbench'
--
1.8.3.1