From: Štěpán Balážik <stepan@isc.org>
Date: Wed, 4 Jun 2025 13:22:12 +0000 (+0200)
Subject: Clean up the definitions and usages of `&unit_test_*` anchors
X-Git-Tag: v9.21.10~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4303e0691968824ae8b8938e1ab121386f32f83a;p=thirdparty%2Fbind9.git

Clean up the definitions and usages of `&unit_test_*` anchors

Remove redundant indirections and overwrites.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7ad056ef50..51ea3d1a730 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -444,7 +444,7 @@ stages:
     - *display_pytest_failures
     - *parse_tsan
 
-.unit_test_common: &unit_test_common
+.unit_test_common: &unit_test_job
   <<: *default_triggering_rules
   stage: unit
   # This script needs to: 1) fail if the unit tests fail, 2) fail if the
@@ -467,14 +467,8 @@ stages:
     reports:
       junit: junit.xml
 
-.unit_test: &unit_test_job
-  <<: *unit_test_common
-
-.unit_test_gcov: &unit_test_gcov_job
-  <<: *unit_test_common
-
 .unit_test_tsan: &unit_test_tsan_job
-  <<: *unit_test_common
+  <<: *unit_test_job
   after_script:
     - *find_python
     - *parse_tsan
@@ -929,7 +923,7 @@ system:gcc:bookworm:amd64:
 
 unit:gcc:bookworm:amd64:
   <<: *debian_bookworm_amd64_image
-  <<: *unit_test_gcov_job
+  <<: *unit_test_job
   variables:
     CI_ENABLE_ALL_TESTS: 1
     CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0