summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2017-09-30 00:50:40 -0300
committerdrebs <drebs@riseup.net>2017-09-30 00:50:40 -0300
commitf167e95247ebffccb251af617cee911154603735 (patch)
tree5db365ac9252a2a96cf497bb43f4e8eb11ce7955 /.gitlab-ci.yml
parent8aa665df40a1535012e8dcf990ae21c473631948 (diff)
[test] run benchmark tests in parallel with other tests
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e70b2072..e8794033 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,6 @@ stages:
- build
- tests
- package
- - benchmark
variables:
@@ -58,7 +57,7 @@ tests:
- tox -- --couch-url http://couchdb:5984
time-cpu:
- stage: benchmark
+ stage: tests
image: 0xacab.org:4567/leap/soledad:latest
tags:
- benchmark
@@ -83,7 +82,7 @@ time-cpu:
- 'if [ -d .benchmarks ]; then find .benchmarks -type f -exec cat {} \; ; fi'
memory:
- stage: benchmark
+ stage: tests
image: 0xacab.org:4567/leap/soledad:latest
tags:
- benchmark
@@ -108,7 +107,7 @@ memory:
- 'if [ -d .benchmarks ]; then find .benchmarks -type f -exec cat {} \; ; fi'
responsiveness:
- stage: benchmark
+ stage: tests
image: 0xacab.org:4567/leap/soledad:latest
tags:
- benchmark