From a48e2f8521025b0992e87245cb02a90a5fc74e58 Mon Sep 17 00:00:00 2001
From: Varac <varac@leap.se>
Date: Sat, 23 Dec 2017 11:54:24 +0100
Subject: [test] Split monolithic e2e test into seperate tests

---
 .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++++----
 Makefile       |  6 +++++-
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba2fa048..d6250e43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ bitmask_latest_bundle:
   tags:
     - linux
 
-e2e_tests:
+e2e_test_mail:
   image: 0xacab.org:4567/leap/bitmask-dev:latest
   stage: e2e
   allow_failure: true
@@ -65,15 +65,47 @@ e2e_tests:
     - make dev-latest-backend
     - mkdir -p /root/.config/leap/
     - make install_helpers
-    - make test_e2e
+    - make test_e2e_mail
+  tags:
+    - linux
+
+e2e_test_vpn:
+  image: 0xacab.org:4567/leap/bitmask-dev:latest
+  stage: e2e
+  allow_failure: true
+  dependencies:
+      - linux_test
+  script:
+    - dpkg -l tox gnupg1 haveged  > /dev/null || apt-get -y --no-install-recommends install tox gnupg1 haveged
+    - tox -e py27-dev --notest
+    - source .tox/py27-dev/bin/activate
+    - make dev-latest-backend
+    - mkdir -p /root/.config/leap/
+    - make install_helpers
+    - make test_e2e_vpn
+  tags:
+    - linux
+
+e2e_test_conditional_downloads:
+  image: 0xacab.org:4567/leap/bitmask-dev:latest
+  stage: e2e
+  allow_failure: true
+  dependencies:
+      - linux_test
+  script:
+    - dpkg -l tox gnupg1 haveged  > /dev/null || apt-get -y --no-install-recommends install tox gnupg1 haveged
+    - tox -e py27-dev --notest
+    - source .tox/py27-dev/bin/activate
+    - make dev-latest-backend
+    - mkdir -p /root/.config/leap/
+    - make install_helpers
+    - make test_e2e_conditional_downloads
   tags:
     - linux
 
 functional_tests:
   image: 0xacab.org:4567/leap/bitmask-dev:latest
   stage: functional
-  dependencies:
-      - e2e_tests
   before_script:
     - dpkg -l tox > /dev/null || apt-get -y --no-install-recommends install tox
     - tox -e py27-dev --notest
diff --git a/Makefile b/Makefile
index 476f8da3..8dd0aeec 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,13 @@ uninstall:
 test:
 	tox
 
-test_e2e: install_helpers
+test_e2e_mail: install_helpers
 	tests/e2e/e2e-test-mail.sh
+
+test_e2e_vpn: install_helpers
 	tests/e2e/e2e-test-vpn.sh
+
+test_e2e_conditional_downloads: install_helpers
 	tests/e2e/conditional_downloads.py
 
 test_functional_setup:
-- 
cgit v1.2.3