summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-03-14 20:22:55 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-03-14 20:22:55 +0100
commita6b83223ee5437936dc0389a92bde68bd93d477c (patch)
tree179ddc546f17a712de7f2650e64cff51f7570d89
parentd43a10c718f7cea2dd700d0a6e0e94652743f1fa (diff)
[tests] make e2e test non-critical
-rw-r--r--.gitlab-ci.yml28
1 files changed, 17 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 197e51d..f805582 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ stages:
- test
- bundle
- build
+ - e2e
test:
image: leapcode/soledad:latest
@@ -9,6 +10,16 @@ test:
script:
- tox --recreate -e py27-dev
+bitmask_latest_bundle:
+ image: leapcode/bitmask-dev:latest
+ stage: bundle
+ script: pkg/build_bundle_with_venv.sh
+ artifacts:
+ paths:
+ - dist/bitmask-*
+ name: "Bitmask_linux64_latest_${CI_BUILD_REF}"
+ expire_in: 1 month
+
build:
image: leapcode/bitmask-dev:latest
stage: build
@@ -19,16 +30,11 @@ build:
- mkdir -p /root/.config/leap/
- bitmaskd
- bitmaskctl status
- - apt install swaks
- - make test_e2e
-
-bitmask_latest_bundle:
+e2e_tests:
image: leapcode/bitmask-dev:latest
- stage: bundle
- script: pkg/build_bundle_with_venv.sh
- artifacts:
- paths:
- - dist/bitmask-*
- name: "Bitmask_linux64_latest_${CI_BUILD_REF}"
- expire_in: 1 month
+ stage: e2e
+ allow_failure: true
+ script:
+ - apt install swaks
+ - make test_e2e