From a1d3fb98b7539da31c08a99e02e4082247982de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Tue, 4 Oct 2022 16:14:00 +0200 Subject: [PATCH] Fix TSAN artifact gathering in CI Fixup for 2c3b2dabe9a6b3c4a10f6498a1169f39ed031eed. We forgot to update TSAN paths when moving all the unit tests to /tests/. Let's remove paths from find to make it less dependent on exact location, and store all untracked files as we do in the normal unit test template. Related: !6243 (cherry picked from commit 9559eb3b21fec007c53c314be2ebcaf6a12782b2) --- .gitlab-ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f543722d2..099b2b17f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -340,12 +340,12 @@ stages: after_script: - cat bin/tests/system/test-suite.log - *find_python - - find bin -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \; + - find -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \; - > "$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml artifacts: - expire_in: "1 day" untracked: true + expire_in: "1 day" when: always reports: junit: junit.xml @@ -385,15 +385,12 @@ stages: <<: *unit_test_common after_script: - *find_python - - find lib -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \; + - find -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \; - > "$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml artifacts: + untracked: true expire_in: "1 day" - paths: - - tests/*/tsan.* - - tsan/ - - junit.xml when: always reports: junit: junit.xml