summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml29
-rw-r--r--testing/tox.ini1
2 files changed, 28 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11c482b5..76d22b3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,31 @@
+stages:
+ - syntax
+ - tests
+ - benchmark
+
+syntax:
+ stage: syntax
+ script:
+ - cd testing
+ - tox -e pep8
+
tests:
+ stage: tests
+ image: leapcode/soledad:1.0
+ services:
+ - couchdb
+ script:
+ - cd testing
+ - tox -- --couch-url http://couchdb:5984
+
+benchmark:
+ stage: benchmark
image: leapcode/soledad:1.0
services:
- - couchdb
+ - couchdb
script:
- - cd testing; tox -- --couch-url http://couchdb:5984 && tox -e pep8
+ - cd testing
+ - tox -e perf -- --couch-url http://couchdb:5984
+ tags:
+ - docker
+ - benchmark
diff --git a/testing/tox.ini b/testing/tox.ini
index 88ca9fcc..231b2a9a 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -30,6 +30,7 @@ install_command = pip install {opts} {packages}
deps =
{[testenv]deps}
pytest-benchmark
+basepython = python2.7
commands = py.test tests/perf {posargs}
[testenv:pep8]