diff options
| author | Azul <azul@riseup.net> | 2017-07-20 13:46:01 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2017-07-20 13:46:01 +0200 |
| commit | eecf6ad13801b63c6b7664d8a2e98e905262aaa0 (patch) | |
| tree | fadf7d8270106a628c31b1f7017f343a94f311f0 /.gitlab-ci.yml | |
| parent | c81b98df15e3d2006c991c9ca9d86500e3599e9b (diff) | |
| parent | d6abd906cb64ae68eed3348eba521bc44ebed7b2 (diff) | |
Merge branch 'functional_tests'
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c05494fb..cc7520f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ stages: - test + - e2e - bundle - build_ui - - e2e variables: DOCKER_DRIVER: overlay @@ -28,7 +28,7 @@ bitmask_latest_bundle: stage: bundle script: - pkg/build_bundle_with_venv.sh - - mv "dist/bitmask-`cat pkg/next-version`" . + - mv "dist/bitmask-`cat pkg/next-version`" . artifacts: paths: - "bitmask-`cat pkg/next-version`" @@ -59,6 +59,25 @@ e2e_tests: tags: - linux +functional_tests: + image: 0xacab.org:4567/leap/bitmask-dev:latest + stage: e2e + before_script: + - virtualenv venv + - source venv/bin/activate + - make dev-latest-all + - make test_functional_setup + script: + - make test_functional + artifacts: + when: on_failure + paths: + - "/tmp/*.png" + name: "Bitmask_linux64_${CI_BUILD_REF}_e2e_screenshots" + expire_in: 1 month + tags: + - linux + build_docker_image: image: 0xacab.org:4567/leap/bitmask-dev:latest stage: test |