From 14457ec326a6ef4358d5ac82125e1c1d97f92c3e Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 7 Apr 2026 17:55:31 +0200
Subject: [PATCH 1/2] Add Ubuntu 26.04 Resolute Raccoon

---
 .gitlab-ci.yml            | 28 ++++++++++++++++++++++++++++
 doc/arm/platforms.inc.rst |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe0f469105..a7dd6da60e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -262,6 +262,10 @@ stages:
   image: "$CI_REGISTRY_IMAGE:ubuntu-noble-amd64"
   <<: *linux_amd64
 
+.ubuntu-resolute-amd64: &ubuntu_resolute_amd64_image
+  image: "$CI_REGISTRY_IMAGE:ubuntu-resolute-amd64"
+  <<: *linux_amd64
+
 # Base image
 # This is a meta image that is used as a base for non-specific jobs
 
@@ -1576,6 +1580,30 @@ unit:gcc:noble:amd64:
     - job: gcc:noble:amd64
       artifacts: true
 
+# Jobs for regular GCC builds on Ubuntu 26.04 Resolute Raccoon (amd64)
+
+gcc:resolute:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "-Didn=enabled"
+  <<: *ubuntu_resolute_amd64_image
+  <<: *build_job
+
+system:gcc:resolute:amd64:
+  <<: *ubuntu_resolute_amd64_image
+  <<: *system_test_job
+  needs:
+    - job: gcc:resolute:amd64
+      artifacts: true
+
+unit:gcc:resolute:amd64:
+  <<: *ubuntu_resolute_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: gcc:resolute:amd64
+      artifacts: true
+
 # Jobs for ASAN builds on Fedora 43 (amd64)
 
 gcc:asan:
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index f3b472b5a0..e7b62a7136 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -44,7 +44,7 @@ Current versions of BIND 9 are fully supported and regularly tested on the
 following systems:
 
 -  Debian 12, 13
--  Ubuntu LTS 22.04, 24.04
+-  Ubuntu LTS 22.04, 24.04, 26.04
 -  Fedora 43
 -  Red Hat Enterprise Linux / CentOS / AlmaLinux 8, 9, 10
 -  FreeBSD 13, 14, 15

From 9978393c360bcf06ccd1bcbfc98f522640c1e04d Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 7 Apr 2026 17:57:45 +0200
Subject: [PATCH 2/2] Do not run Noble Numbat unit test job in MRs

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7dd6da60e..91a0945f00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1576,6 +1576,7 @@ system:gcc:noble:amd64:
 unit:gcc:noble:amd64:
   <<: *ubuntu_noble_amd64_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:noble:amd64
       artifacts: true