From: Štěpán Balážik <stepan@isc.org>
Date: Wed, 4 Jun 2025 13:06:09 +0000 (+0200)
Subject: Hoist the artifact handling to the `&system_test_common` anchor
X-Git-Tag: v9.21.10~21^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c61ff639b3a5aa7d4513efdc893aadff95a56c60;p=thirdparty%2Fbind9.git

Hoist the artifact handling to the `&system_test_common` anchor

In the past artifacts of different types of system test jobs were
treated differently but this is no longer the case.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e006364fa90..80cfda53b6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -430,9 +430,6 @@ stages:
     - test "$CLEAN_BUILD_ARTIFACTS_ON_SUCCESS" -eq 0 || ( cd ../../.. && ninja -C build clean >/dev/null 2>&1 )
   after_script:
     - *display_pytest_failures
-
-.system_test: &system_test_job
-  <<: *system_test_common
   artifacts:
     untracked: true
     exclude:
@@ -441,26 +438,17 @@ stages:
     reports:
       junit: junit.xml
 
+.system_test: &system_test_job
+  <<: *system_test_common
+
 .system_test_gcov: &system_test_gcov_job
   <<: *system_test_common
-  artifacts:
-    untracked: true
-    exclude:
-      - "**/__pycache__/**/*"
-    when: always
 
 .system_test_tsan: &system_test_tsan_job
   <<: *system_test_common
   after_script:
     - *display_pytest_failures
     - *parse_tsan
-  artifacts:
-    untracked: true
-    exclude:
-      - "**/__pycache__/**/*"
-    when: always
-    reports:
-       junit: junit.xml
 
 .unit_test_common: &unit_test_common
   <<: *default_triggering_rules