From f0011ecb13e20970f1fe71966c3c8d66e02bbbb0 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 24 Apr 2024 18:56:21 +0200
Subject: [PATCH] Add Ubuntu 24.04 LTS (Noble Numbat)

(cherry picked from commit d02ed1a0ebd7957127a843279a331e44e8412700)
---
 .gitlab-ci.yml        | 28 ++++++++++++++++++++++++++++
 doc/arm/platforms.rst |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de9241d3ba..9329ee95d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,6 +180,10 @@ stages:
   image: "$CI_REGISTRY_IMAGE:ubuntu-jammy-amd64"
   <<: *linux_amd64
 
+.ubuntu-noble-amd64: &ubuntu_noble_amd64_image
+  image: "$CI_REGISTRY_IMAGE:ubuntu-noble-amd64"
+  <<: *linux_amd64
+
 # Windows
 
 .windows-server-2016-amd64: &windows_server_2016_amd64_image
@@ -754,6 +758,30 @@ gcc:tarball:nosphinx:
     - job: tarball-create
       artifacts: true
 
+# Jobs for regular GCC builds on Ubuntu 24.04 Noble Numbat (amd64)
+
+gcc:noble:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "--with-libidn2"
+  <<: *ubuntu_noble_amd64_image
+  <<: *build_job
+
+system:gcc:noble:amd64:
+  <<: *ubuntu_noble_amd64_image
+  <<: *system_test_job
+  needs:
+    - job: gcc:noble:amd64
+      artifacts: true
+
+unit:gcc:noble:amd64:
+  <<: *ubuntu_noble_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: gcc:noble:amd64
+      artifacts: true
+
 # Jobs for Debian 11 "bullseye" (amd64)
 
 clang:bullseye:amd64:
diff --git a/doc/arm/platforms.rst b/doc/arm/platforms.rst
index d60b68b1fb..324c586e79 100644
--- a/doc/arm/platforms.rst
+++ b/doc/arm/platforms.rst
@@ -46,7 +46,7 @@ Current versions of BIND 9 are fully supported and regularly tested on the
 following systems:
 
 -  Debian 11, 12
--  Ubuntu LTS 20.04, 22.04
+-  Ubuntu LTS 20.04, 22.04, 24.04
 -  Fedora 39
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 13.3, 14.0