From c61ff639b3a5aa7d4513efdc893aadff95a56c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= <stepan@isc.org>
Date: Wed, 4 Jun 2025 15:06:09 +0200
Subject: [PATCH] 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.
---
 .gitlab-ci.yml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e006364fa9..80cfda53b6 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