From: Michal Nowak <mnowak@isc.org>
Date: Thu, 19 Sep 2024 09:26:53 +0000 (+0200)
Subject: Exclude some RPZ files from long stress test artifacts
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a500446ed376d9aaafb6cff7367cf34dbe5afcc;p=thirdparty%2Fbind9.git

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)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c41d98269d9..635be6dd617 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1236,7 +1236,7 @@ respdiff-third-party:
     - LD_LIBRARY_PATH="${INSTALL_PATH}/usr/local/lib" BIND_INSTALL_PATH="${INSTALL_PATH}/usr/local" WORKSPACE="${CI_PROJECT_DIR}" bash stress.sh
   needs: []
 
-.stress-test-short: &stress_test_short_job
+.stress-test-long: &stress_test_long_job
   <<: *stress_test
   artifacts:
     untracked: true
@@ -1244,9 +1244,21 @@ respdiff-third-party:
       - "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
@@ -1353,14 +1365,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