diff options
| author | Kali Kaneko <kali@leap.se> | 2017-08-15 22:27:41 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-08-30 16:18:45 -0400 |
| commit | e074c4bd23f4386519dae02d5687270ba294f636 (patch) | |
| tree | 3f8e9908e8810d2b3d2cdc36f432fb88ad90fcce | |
| parent | cd6edbf11551ac9165bab6e8d043a80621994671 (diff) | |
[tests] add step to run functional tests on bundle
| -rw-r--r-- | .gitlab-ci.yml | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c5842d3..12a01823 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ stages: - test - e2e - bundle + - test_bundle - build_ui - package @@ -42,17 +43,6 @@ bitmask_latest_bundle: tags: - linux -build_ui: - image: 0xacab.org:4567/leap/bitmask-dev:latest - stage: build_ui - script: - - cd ui && make dev-build - tags: - - linux - cache: - paths: - - ui/node_modules/ - e2e_tests: image: 0xacab.org:4567/leap/bitmask-dev:latest stage: e2e @@ -86,6 +76,33 @@ functional_tests: tags: - linux +functional_test_bundle: + image: 0xacab.org:4567/leap/bitmask-dev:latest + stage: test_bundle + dependencies: + - bitmask_latest_bundle + script: + - TEST_MODE='bundle_ci' make test_functional + artifacts: + when: on_failure + paths: + - failures + name: "Bitmask_linux64_${CI_BUILD_REF}_e2e_screenshots" + expire_in: 1 month + tags: + - linux + +build_ui: + image: 0xacab.org:4567/leap/bitmask-dev:latest + stage: build_ui + script: + - cd ui && make dev-build + tags: + - linux + cache: + paths: + - ui/node_modules/ + build_docker_image: image: 0xacab.org:4567/leap/bitmask-dev:latest stage: test |