From: Michał Kępień <michal@isc.org>
Date: Thu, 26 Mar 2020 10:03:52 +0000 (+0100)
Subject: Run "kyua report-html" for TSAN unit test jobs
X-Git-Tag: v9.14.12~9^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e2428a545b791fd1f48c0faa43ce96a93352416;p=thirdparty%2Fbind9.git

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.

(cherry picked from commit 6ebce9425e21615bfbe2aafe3bbc0b001885e882)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 584a0272bd0..036933bc7d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -949,6 +949,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"
@@ -988,6 +989,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"