summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-07-11 15:39:01 +0200
committerKali Kaneko <kali@leap.se>2016-07-12 03:09:35 +0200
commit0bd98f5d6ab8548afb84a9570aee2d7dccd89db5 (patch)
tree6f60f85c17c7360d911f7e4c5b19b8fa11276a04
parent769ce3d7a014b1e1e0fba23df6993271cfd647ba (diff)
[test] use tox in gitlab-ci
-rw-r--r--.gitlab-ci.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1aab6d74..647cc43c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-image: leap/soledad:1.0
-
-test:
+trial:
script:
- - /usr/local/soledad/run-trial-from-gitlab-ci.sh
+ - cd testing; tox