summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-03-14 19:44:49 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-03-15 19:05:34 +0100
commit86c9ae95e847d8025214427585ffee0d7fb553a8 (patch)
tree6780e0689a7bfe8dee371cfa54d87952ea8bdcee /.gitlab-ci.yml
parent72350b78a14dc5fd8d63b41b86a2394e9e898b15 (diff)
[tests] let's include OSX CI
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml17
1 files changed, 16 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3d256b..7cae846 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,20 @@ stages:
- build
- e2e
-test:
+linux_test:
image: leapcode/soledad:latest
stage: test
script:
- tox --recreate -e py27-dev
+ tags:
+ - linux
+
+osx_test:
+ stage: test
+ script:
+ - tox --recreate -e py27-dev
+ tags:
+ - osx
bitmask_latest_bundle:
image: leapcode/bitmask-dev:latest
@@ -19,12 +28,16 @@ bitmask_latest_bundle:
- dist/bitmask-*
name: "Bitmask_linux64_latest_${CI_BUILD_REF}"
expire_in: 1 month
+ tags:
+ - linux
build_ui:
image: leapcode/bitmask-dev:latest
stage: build
script:
- cd ui && make dev-build
+ tags:
+ - linux
e2e_tests:
image: leapcode/bitmask-dev:latest
@@ -37,3 +50,5 @@ e2e_tests:
- mkdir -p /root/.config/leap/
- apt install swaks
- make test_e2e
+ tags:
+ - linux