From f167e95247ebffccb251af617cee911154603735 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Sat, 30 Sep 2017 00:50:40 -0300
Subject: [test] run benchmark tests in parallel with other tests

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

(limited to '.gitlab-ci.yml')

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
-- 
cgit v1.2.3