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.18.38~10^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=277ab295066f4d7a39e9917aba79612561ab2038;p=thirdparty%2Fbind9.git

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

Remove redundant indirections and overwrites.

(cherry picked from commit 4303e0691968824ae8b8938e1ab121386f32f83a)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6dc2553c632..1e036c32df3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -488,7 +488,7 @@ stages:
     - *find_python
     - *parse_tsan
 
-.unit_test_common: &unit_test_common
+.unit_test_common: &unit_test_job
   <<: *default_triggering_rules
   stage: unit
   before_script:
@@ -513,14 +513,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
@@ -948,7 +942,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