From cfc64ecb77531aa5de684666a2d44df6fab57b94 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 5 Aug 2025 18:19:34 +0200
Subject: [PATCH] Move CI and QA tools from Debian "sid" to "trixie"

Debian "sid" is not a stable test bed and should be avoided.

(cherry picked from commit 840069856f5b994e40dff53e4dc02e682798cbb1)
---
 .gitlab-ci.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fb05d630c..f07011c523 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -675,7 +675,7 @@ coccinelle:
   # Revert to using the "precheck_job" anchor after the "base" image is
   # upgraded to Debian trixie, which has Coccinelle 1.2.
   <<: *default_triggering_rules
-  <<: *debian_sid_amd64_image
+  <<: *debian_trixie_amd64_image
   stage: precheck
   ######################################################################
   needs: []
@@ -698,7 +698,7 @@ doctest:
 
 pylint:
   <<: *default_triggering_rules
-  <<: *debian_sid_amd64_image
+  <<: *debian_trixie_amd64_image
   stage: precheck
   needs: []
   variables:
@@ -747,7 +747,7 @@ checkbashisms:
 
 mypy:
   <<: *default_triggering_rules
-  <<: *debian_sid_amd64_image
+  <<: *debian_trixie_amd64_image
   stage: precheck
   script:
     - mypy "bin/tests/system/isctest/"
@@ -1223,10 +1223,12 @@ scan-build:
       - scan-build.reports/
     when: on_failure
 
-# Jobs for strict OpenSSL 3.x (no deprecated) GCC builds on Debian "sid" (amd64)
+# Jobs for strict OpenSSL 3.x (no deprecated) GCC builds on Debian "trixie" (amd64)
 # Run with pkcs11-provider tests
 
-gcc:ossl3:sid:amd64:
+gcc:ossl3:trixie:amd64:
+  <<: *debian_trixie_amd64_image
+  <<: *build_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O3 -DOPENSSL_NO_DEPRECATED=1 -DOPENSSL_API_COMPAT=30000"
@@ -1234,25 +1236,23 @@ gcc:ossl3:sid:amd64:
     EXTRA_CONFIGURE: "--without-jemalloc --disable-leak-detection"
     GNUMAKEFLAGS: "--shuffle=reverse"
     RUN_MAKE_INSTALL: 1
-  <<: *debian_sid_amd64_image
-  <<: *build_job
 
-system:gcc:ossl3:sid:amd64:
+system:gcc:ossl3:trixie:amd64:
   # Set up environment variables to run pkcs11-provider based system tests
   variables:
     OPENSSL_CONF: "/var/tmp/etc/openssl-provider.cnf"
     SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
-  <<: *debian_sid_amd64_image
+  <<: *debian_trixie_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:ossl3:sid:amd64
+    - job: gcc:ossl3:trixie:amd64
       artifacts: true
 
 unit:gcc:ossl3:amd64:
-  <<: *debian_sid_amd64_image
+  <<: *debian_trixie_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:ossl3:sid:amd64
+    - job: gcc:ossl3:trixie:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Debian "sid" (amd64)
@@ -1263,7 +1263,6 @@ gcc:sid:amd64:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O3"
     EXTRA_CONFIGURE: "--with-libidn2 --without-lmdb ${WITH_READLINE}"
-    RUN_MAKE_INSTALL: 1
   <<: *debian_sid_amd64_image
   <<: *build_job