From 6ebce9425e21615bfbe2aafe3bbc0b001885e882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 26 Mar 2020 11:03:52 +0100 Subject: [PATCH] Run "kyua report-html" for TSAN unit test jobs Definitions of jobs running unit tests under TSAN contain an "after_script" YAML key. Since the "unit_test_job" anchor is included in those job definitions before "after_script" is defined, the job-specific value of that key overrides the one defined in the included anchor. This prevents "kyua report-html" from being run for TSAN unit test jobs. Moving the invocation of "kyua report-html" to the "script" key in the "unit_test_job" anchor is not acceptable as it would cause the exit code of that command to determine the result of all unit test jobs and we need that to be the exit code of "make unit". Instead, add "kyua report-html" invocations to the "after_script" key of TSAN unit test job definitions to address the problem without affecting other job definitions. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ac9f9d49c..0998c1760a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -947,6 +947,7 @@ unit:gcc:tsan: artifacts: true allow_failure: true after_script: + - *kyua_report_html - find lib -name 'tsan.*' -exec python3 util/parse_tsan.py {} \; artifacts: expire_in: "1 day" @@ -986,6 +987,7 @@ unit:clang:tsan: artifacts: true allow_failure: true after_script: + - *kyua_report_html - find lib -name 'tsan.*' -exec python3 util/parse_tsan.py {} \; artifacts: expire_in: "1 day"