From c0e4596fb2a3f040b760f1c488dca8c2e0bdaea8 Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 9 Mar 2023 13:30:41 +0100
Subject: [PATCH 1/2] Move gitlab-ci.yml comment to its proper place

The comment refers to "interruptible" key, rather than the entire
"default" section.

(cherry picked from commit 11399074509b788ecfbbb2710bc65bd49b1970d2)
---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e2b658a89..72382a95e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,11 +44,11 @@ variables:
   BIND_STRESS_TEST_OS: linux
   BIND_STRESS_TEST_ARCH: amd64
 
-# Allow all running CI jobs to be automatically canceled when a new
-# version of a branch is pushed.
-#
-# See: https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-redundant-pipelines
 default:
+  # Allow all running CI jobs to be automatically canceled when a new
+  # version of a branch is pushed.
+  #
+  # See: https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-redundant-pipelines
   interruptible: true
 
 stages:

From 08839485af8db0c305fc464943738d581a24f7cd Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 9 Mar 2023 13:33:31 +0100
Subject: [PATCH 2/2] Use the default retention time for CI artifacts

The instance-wide GitLab CI artifact retention time was changed to 1 day
up from the previous value of 12 hours. Remove our explicit overrides
for 1 day artifact retention time, as it is the default now.

Previously, most of our jobs had overrides for 1 day retention, while
some of our jobs used the default 12 hours. This discrepancy could be
quite impractical at times.

(cherry picked from commit 8fef5676fabd2815081d2560875b5c9f510b6a21)
---
 .gitlab-ci.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72382a95e0..e1ff13dc2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,7 +234,6 @@ stages:
     - autoreconf -fi
   artifacts:
     untracked: true
-    expire_in: "1 day"
 
 .configure: &configure
     - ${CONFIGURE}
@@ -278,7 +277,6 @@ stages:
       artifacts: true
   artifacts:
     untracked: true
-    expire_in: "1 day"
     when: always
 
 .windows_build: &windows_build_job
@@ -304,7 +302,6 @@ stages:
   needs: []
   artifacts:
     untracked: true
-    expire_in: "1 day"
 
 .setup_interfaces: &setup_interfaces
     - if [ "$(id -u)" -eq "0" ]; then
@@ -333,14 +330,12 @@ stages:
   <<: *system_test_common
   artifacts:
     untracked: true
-    expire_in: "1 day"
     when: on_failure
 
 .system_test_gcov: &system_test_gcov_job
   <<: *system_test_common
   artifacts:
     untracked: true
-    expire_in: "1 day"
     when: always
 
 .system_test_tsan: &system_test_tsan_job
@@ -348,7 +343,6 @@ stages:
   after_script:
     - *parse_tsan
   artifacts:
-    expire_in: "1 day"
     untracked: true
     when: on_failure
 
@@ -373,7 +367,6 @@ stages:
     - 'If (Test-Path C:/CrashDumps/*) { dir C:/CrashDumps; Throw }'
   artifacts:
     untracked: true
-    expire_in: "1 day"
     when: on_failure
 
 .unit_test_common: &unit_test_common
@@ -390,14 +383,12 @@ stages:
   <<: *unit_test_common
   artifacts:
     untracked: true
-    expire_in: "1 day"
     when: on_failure
 
 .unit_test_gcov: &unit_test_gcov_job
   <<: *unit_test_common
   artifacts:
     untracked: true
-    expire_in: "1 day"
     when: always
 
 .unit_test_tsan: &unit_test_tsan_job
@@ -407,7 +398,6 @@ stages:
     - *parse_tsan
   artifacts:
     untracked: true
-    expire_in: "1 day"
     when: on_failure
 
 .respdiff: &respdiff_job
@@ -426,7 +416,6 @@ stages:
     exclude:
       - bind-qa/bind9/respdiff/rspworkdir/data.mdb # Exclude a 10 GB file.
     untracked: true
-    expire_in: "1 day"
     when: always
 
 ### Job Definitions
@@ -458,7 +447,6 @@ misc:
   artifacts:
     paths:
       - checklibs.out
-    expire_in: "1 day"
     when: on_failure
 
 black:
@@ -827,7 +815,6 @@ scan-build:
   artifacts:
     paths:
       - scan-build.reports/
-    expire_in: "1 day"
     when: on_failure
 
 # Jobs for regular GCC builds on Debian "sid" (amd64)