diff options
author | Kali Kaneko <kali@leap.se> | 2017-08-15 22:27:41 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2017-08-16 17:30:20 -0400 |
commit | 9d1360c9fd5e3cb4d34ff6efac98bea92bf85c92 (patch) | |
tree | 1bd2e877ae09f4fde7f18a6ba615934fe9f44934 | |
parent | 7d497583461639640d211b7a3dfc34931e8f3e54 (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 003d6da4..4f5660ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ stages: - test - e2e - bundle + - test_bundle - build_ui variables: @@ -40,17 +41,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 @@ -84,6 +74,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 |