From b0a7e13c884b2fb4f06a45ba474dbb6f94da3357 Mon Sep 17 00:00:00 2001
From: matejcik <ja@matejcik.cz>
Date: Tue, 8 Feb 2022 13:46:18 +0100
Subject: [PATCH] ci: remove separate "UI" job, do UI test in the default
 "device test" job

---
 ci/deploy.yml   |  2 +-
 ci/posttest.yml |  2 +-
 ci/test.yml     | 27 +++++----------------------
 docs/ci/jobs.md |  4 ++--
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/ci/deploy.yml b/ci/deploy.yml
index 586251b51..2a3ff0f60 100644
--- a/ci/deploy.yml
+++ b/ci/deploy.yml
@@ -233,7 +233,7 @@ ui tests core fixtures deploy:
     GIT_SUBMODULE_STRATEGY: "none"
   before_script: []  # no poetry
   needs:
-    - core device ui test
+    - core device test
   script:
     - echo "Deploying to $DEPLOY_PATH"
     - rsync --delete -va ci/ui_test_records/* "$DEPLOY_PATH"
diff --git a/ci/posttest.yml b/ci/posttest.yml
index dca9423d7..977c43636 100644
--- a/ci/posttest.yml
+++ b/ci/posttest.yml
@@ -34,7 +34,7 @@ core unix ui changes:
     - master
   <<: *gitlab_caching
   needs:
-    - core device ui test
+    - core device test
   script:
     - nix-shell --run "cd tests/ui_tests ; poetry run python reporting/report_master_diff.py"
     - mv tests/ui_tests/reporting/reports/master_diff/ .
diff --git a/ci/test.yml b/ci/test.yml
index 1ffa91696..f1658e90c 100644
--- a/ci/test.yml
+++ b/ci/test.yml
@@ -46,13 +46,16 @@ core unit test t1:
   script:
     - nix-shell --run "poetry run make -C core test_rust | ts -s"
 
-core device ui test:
+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_ui | ts -s"
+    - mv core/src/.coverage core/.coverage.test_emu
   after_script:
     - mv tests/ui_tests/reporting/reports/test/ test_ui_report
     - 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/junit.xml
       - 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.*
-    expire_in: 1 week
     when: always
+    expire_in: 1 week
     reports:
       junit: tests/junit.xml
 
diff --git a/docs/ci/jobs.md b/docs/ci/jobs.md
index 38a1505f6..9341b73bf 100644
--- a/docs/ci/jobs.md
+++ b/docs/ci/jobs.md
@@ -85,9 +85,9 @@ build? This is most likely it.**
 
 ## 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.
 
 ### hardware core regular device test