ci: remove separate "UI" job, do UI test in the default "device test" job

pull/2116/head
matejcik 2 years ago committed by matejcik
parent abc593d19a
commit b0a7e13c88

@ -233,7 +233,7 @@ ui tests core fixtures deploy:
GIT_SUBMODULE_STRATEGY: "none" GIT_SUBMODULE_STRATEGY: "none"
before_script: [] # no poetry before_script: [] # no poetry
needs: needs:
- core device ui test - core device test
script: script:
- echo "Deploying to $DEPLOY_PATH" - echo "Deploying to $DEPLOY_PATH"
- rsync --delete -va ci/ui_test_records/* "$DEPLOY_PATH" - rsync --delete -va ci/ui_test_records/* "$DEPLOY_PATH"

@ -34,7 +34,7 @@ core unix ui changes:
- master - master
<<: *gitlab_caching <<: *gitlab_caching
needs: needs:
- core device ui test - core device test
script: script:
- nix-shell --run "cd tests/ui_tests ; poetry run python reporting/report_master_diff.py" - nix-shell --run "cd tests/ui_tests ; poetry run python reporting/report_master_diff.py"
- mv tests/ui_tests/reporting/reports/master_diff/ . - mv tests/ui_tests/reporting/reports/master_diff/ .

@ -46,13 +46,16 @@ core unit test t1:
script: script:
- nix-shell --run "poetry run make -C core test_rust | ts -s" - nix-shell --run "poetry run make -C core test_rust | ts -s"
core device ui test: core device test:
stage: test stage: test
<<: *gitlab_caching <<: *gitlab_caching
needs: needs:
- core unix frozen debug build - core unix frozen debug build
variables:
TREZOR_PROFILING: 1
script: script:
- nix-shell --run "poetry run make -C core test_emu_ui | ts -s" - nix-shell --run "poetry run make -C core test_emu_ui | ts -s"
- mv core/src/.coverage core/.coverage.test_emu
after_script: after_script:
- mv tests/ui_tests/reporting/reports/test/ test_ui_report - mv tests/ui_tests/reporting/reports/test/ test_ui_report
- nix-shell --run "poetry run python ci/prepare_ui_artifacts.py | ts -s" - nix-shell --run "poetry run python ci/prepare_ui_artifacts.py | ts -s"
@ -66,29 +69,9 @@ core device ui test:
- tests/ui_tests/fixtures.suggestion.json - tests/ui_tests/fixtures.suggestion.json
- tests/junit.xml - tests/junit.xml
- tests/trezor.log - tests/trezor.log
when: always
expire_in: 1 week
reports:
junit: tests/junit.xml
core device test:
stage: test
<<: *gitlab_caching
needs:
- core unix frozen debug build
variables:
TREZOR_PROFILING: 1
script:
- nix-shell --run "poetry run make -C core test_emu | ts -s"
- mv core/src/.coverage core/.coverage.test_emu
artifacts:
name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
paths:
- tests/trezor.log
- tests/junit.xml
- core/.coverage.* - core/.coverage.*
expire_in: 1 week
when: always when: always
expire_in: 1 week
reports: reports:
junit: tests/junit.xml junit: tests/junit.xml

@ -85,9 +85,9 @@ build? This is most likely it.**
## Test ## Test
### core device ui test ### core device test
UI tests for Core. See artifacts for a comprehensive report of UI. See [tests/ui-tests](../tests/ui-tests.html#reports) Device tests with UI report for Core. See artifacts for a comprehensive report of UI. See [tests/ui-tests](../tests/ui-tests.html#reports)
for more info. for more info.
### hardware core regular device test ### hardware core regular device test

Loading…
Cancel
Save