From f4122dfcd08404aa102355aff68f340eca6a8245 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 19 Sep 2024 11:26:53 +0200
Subject: [PATCH] Exclude some RPZ files from long stress test artifacts

This fixes 6f868853049769cd4c327acf32a8c1a7320daa06, that excluded files
only from short stress tests.

(cherry picked from commit 871eeed519c323e54fb4c052e5b405c01dcdbeaa)
---
 .gitlab-ci.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6756e4fb3..33c214c744 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1592,7 +1592,7 @@ shotgun:dot:
     - job: autoreconf
       artifacts: true
 
-.stress-test-short: &stress_test_short_job
+.stress-test-long: &stress_test_long_job
   <<: *stress_test
   artifacts:
     untracked: true
@@ -1600,9 +1600,21 @@ shotgun:dot:
       - "output/ns4/*.dtq*"
       - "output/ns4/large-delta-rpz*.local"
       - "output/rpz_*"
+    expire_in: "1 week"
     when: always
+  timeout: 2h
+
+.stress-test-short: &stress_test_short_job
+  <<: *stress_test
   only:
     - merge_requests
+  artifacts:
+    untracked: true
+    exclude:
+      - "output/ns4/*.dtq*"
+      - "output/ns4/large-delta-rpz*.local"
+      - "output/rpz_*"
+    when: always
 
 stress:short:authoritative:fedora:40:amd64:
   <<: *fedora_40_amd64_image
@@ -1709,14 +1721,6 @@ stress:short:rpz:freebsd13:amd64:
     RATE: 1500
     RUN_TIME: 15
 
-.stress-test-long: &stress_test_long_job
-  <<: *stress_test
-  artifacts:
-    untracked: true
-    expire_in: "1 week"
-    when: always
-  timeout: 2h
-
 stress:authoritative:fedora:40:amd64:
   <<: *fedora_40_amd64_image
   <<: *linux_amd64