From a6b83223ee5437936dc0389a92bde68bd93d477c Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 14 Mar 2017 20:22:55 +0100
Subject: [tests] make e2e test non-critical

---
 .gitlab-ci.yml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 197e51d9..f805582b 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
-- 
cgit v1.2.3