From 769dc2386249524e87e4cbdc811bc7eb3891df89 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 2 May 2024 17:37:01 +0200
Subject: [PATCH] Rename "stress" tests to long "stress" tests

(cherry picked from commit 58a1a50e76bf36c7d3675a3734d7ee1f0627e735)
---
 .gitlab-ci.yml | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e07e79241d..54c9685d14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1578,7 +1578,7 @@ shotgun:dot:
   when: delayed
   start_in: 5 minutes
 
-.stress: &stress_job
+.stress-test: &stress_test
   stage: performance
   script:
     - *configure
@@ -1591,6 +1591,9 @@ shotgun:dot:
   needs:
     - job: autoreconf
       artifacts: true
+
+.stress-test-long: &stress_test_long_job
+  <<: *stress_test
   artifacts:
     untracked: true
     expire_in: "1 week"
@@ -1600,14 +1603,14 @@ shotgun:dot:
 stress:authoritative:fedora:39:amd64:
   <<: *fedora_39_amd64_image
   <<: *linux_amd64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/bin/flame
     MODE: authoritative
     RATE: 10000
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
@@ -1615,14 +1618,14 @@ stress:authoritative:fedora:39:amd64:
 stress:recursive:fedora:39:amd64:
   <<: *fedora_39_amd64_image
   <<: *linux_amd64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/bin/flame
     MODE: recursive
     RATE: 10000
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
@@ -1630,14 +1633,14 @@ stress:recursive:fedora:39:amd64:
 stress:rpz:fedora:39:amd64:
   <<: *fedora_39_amd64_image
   <<: *linux_amd64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/bin/flame
     MODE: rpz
     RATE: 1500
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /rpz/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
@@ -1645,14 +1648,14 @@ stress:rpz:fedora:39:amd64:
 stress:authoritative:fedora:39:arm64:
   <<: *fedora_39_arm64_image
   <<: *linux_arm64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/bin/flame
     MODE: authoritative
     RATE: 10000
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i)
@@ -1660,14 +1663,14 @@ stress:authoritative:fedora:39:arm64:
 stress:recursive:fedora:39:arm64:
   <<: *fedora_39_arm64_image
   <<: *linux_arm64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/bin/flame
     MODE: recursive
     RATE: 10000
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i)
@@ -1675,56 +1678,56 @@ stress:recursive:fedora:39:arm64:
 stress:rpz:fedora:39:arm64:
   <<: *fedora_39_arm64_image
   <<: *linux_arm64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/bin/flame
     MODE: rpz
     RATE: 1500
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /rpz/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i)
 
 stress:authoritative:freebsd13:amd64:
   <<: *freebsd_stress_amd64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: clang
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/local/bin/flame
     MODE: authoritative
     RATE: 10000
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /freebsd/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
 stress:recursive:freebsd13:amd64:
   <<: *freebsd_stress_amd64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: clang
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/local/bin/flame
     MODE: recursive
     RATE: 10000
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /freebsd/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
 stress:rpz:freebsd13:amd64:
   <<: *freebsd_stress_amd64
-  <<: *stress_job
+  <<: *stress_test_long_job
   variables:
     CC: clang
     CFLAGS: "${CFLAGS_COMMON} -Og"
     FLAME: /usr/local/bin/flame
     MODE: rpz
     RATE: 1500
-    RUN_TIME: 1
+    RUN_TIME: 60
   only:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /freebsd/i && $BIND_STRESS_TEST_MODE =~ /rpz/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)