- Adding 2 servers (sh1, sh2) for performance testing.
Additional gitlab-ci tags for perf testing:
docker_sh1_perf and docker_sh2_perf.
- Rebalance performance testing between servers.
- Changing gitlab-ci tag for performance docker images
from 'perf' to 'deploy'.
Closes #4868
---
.gitlab-ci.yml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae2afce..897f657 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:
@@ -195,7 +193,7 @@ perf_bootstrap:
<<: *perf_only_definition
stage: test
tags:
- - perf
+ - deploy
script:
- ${GITLAB_MAKE} perf_prepare
@@ -203,18 +201,24 @@ perf_bootstrap:
perf_sysbench:
<<: *perf_docker_test_definition
+ tags:
+ - docker_perf
variables:
<<: *perf_vars_definition
BENCH: 'sysbench'
perf_tpcc:
<<: *perf_docker_test_definition
+ tags:
+ - docker_perf
variables:
<<: *perf_vars_definition
BENCH: 'tpcc'
perf_ycsb_hash:
<<: *perf_docker_test_definition
+ tags:
+ - docker_sh2_perf
variables:
<<: *perf_vars_definition
BENCH: 'ycsb'
@@ -222,6 +226,8 @@ perf_ycsb_hash:
perf_ycsb_tree:
<<: *perf_docker_test_definition
+ tags:
+ - docker_sh2_perf
variables:
<<: *perf_vars_definition
BENCH: 'ycsb'
@@ -229,6 +235,8 @@ perf_ycsb_tree:
perf_nosqlbench_hash:
<<: *perf_docker_test_definition
+ tags:
+ - docker_sh1_perf
variables:
<<: *perf_vars_definition
BENCH: 'nosqlbench'
@@ -236,6 +244,8 @@ perf_nosqlbench_hash:
perf_nosqlbench_tree:
<<: *perf_docker_test_definition
+ tags:
+ - docker_sh1_perf
variables:
<<: *perf_vars_definition
BENCH: 'nosqlbench'
@@ -243,6 +253,8 @@ perf_nosqlbench_tree:
perf_cbench:
<<: *perf_docker_test_definition
+ tags:
+ - docker_sh2_perf
variables:
<<: *perf_vars_definition
BENCH: 'cbench'
--
1.8.3.1