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

Remove redundant indirections and overwrites.

(cherry picked from commit cbe9972d3e3c682621c8b6ddf338ffd2f8a872ca)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b49f629c4f589dfc8c52a402d05bca665acdcc4..7a2e5f7be8030563f9e3374fab7af3607f8c7ca3 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -409,7 +409,7 @@ stages:
       artifacts: true
   timeout: 2h
 
-.system_test_common: &system_test_common
+.system_test_common: &system_test_job
   <<: *default_triggering_rules
   stage: system
   before_script:
@@ -459,11 +459,8 @@ stages:
     - >
       "$PYTHON" "$REALSOURCEDIR"/bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml
 
-.system_test: &system_test_job
-  <<: *system_test_common
-
 .system_test_make_check: &system_test_make_check_job
-  <<: *system_test_common
+  <<: *system_test_job
   # This script needs to: 1) fail if the system tests fail, 2) fail if
   # the junit.xml file is broken, 3) produce the junit.xml file even if
   # the system tests fail.  Therefore, $RET is used to "cache" the
@@ -483,11 +480,8 @@ stages:
   after_script:
     - cat bin/tests/system/test-suite.log || true
 
-.system_test_gcov: &system_test_gcov_job
-  <<: *system_test_common
-
 .system_test_tsan: &system_test_tsan_job
-  <<: *system_test_common
+  <<: *system_test_job
   after_script:
     - *display_pytest_failures
     - find bin/tests/system -name "*dig.*" | xargs grep "error" || true
@@ -950,7 +944,7 @@ gcc:bookworm:amd64:
 
 system:gcc:bookworm:amd64:
   <<: *debian_bookworm_amd64_image
-  <<: *system_test_gcov_job
+  <<: *system_test_job
   variables:
     CI_ENABLE_ALL_TESTS: 1
     CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0
@@ -1127,7 +1121,6 @@ gcc:tumbleweed:amd64:
 
 system:gcc:tumbleweed:amd64:
   <<: *tumbleweed_latest_amd64_image
-  <<: *system_test_job
   <<: *system_test_make_check_job
   needs:
     - job: gcc:tumbleweed:amd64