summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-04-18 13:45:24 +0200
committerdrebs <drebs@leap.se>2017-04-19 11:49:41 +0200
commita4558ea4874e0de3561f228b41ef0a94a2e4c326 (patch)
tree89b6930fca578559da4484a85d923ea12249d717 /.gitlab-ci.yml
parentdfdbb358177fd664bdde0630ef50c91e184baf13 (diff)
[test] use soledad image from 0xacab registry in ci
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 f5a68f1e..cef9a965 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,8 @@ stages:
- tests
- benchmark
+image: "0xacab.org:4567/leap/gitlab-buildpackage:soledad"
+
# Cache a folder between builds.
# Tox sets it to be our pip cache.
cache:
@@ -16,14 +18,12 @@ before_script:
code-check:
stage: code-check
- image: leapcode/soledad:latest
script:
- cd testing
- tox -e code-check
tests:
stage: tests
- image: leapcode/soledad:latest
services:
- couchdb
script:
@@ -32,7 +32,6 @@ tests:
benchmark:
stage: benchmark
- image: leapcode/soledad:latest
tags:
- benchmark
services:
@@ -50,4 +49,4 @@ benchmark:
# Add $PYTEST_OPTS to pytest.ini to allow posting benchmark tests
# to an elasticsearch instance
- echo "addopts=$PYTEST_OPTS" >> pytest.ini && chmod 600 pytest.ini
- - tox --recreate -e benchmark -- --couch-url http://couchdb:5984
+ - /usr/bin/unbuffer tox --recreate -e benchmark -- --couch-url http://couchdb:5984 -m 'not synchronous' | /usr/bin/ts -s