From 4c2af3bdfa264167243cd36d8916fb497ecf3c0c Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 15 Jun 2022 16:00:35 +0200
Subject: [PATCH] Add Ubuntu 22.04 LTS (Jammy Jellyfish)

---
 .gitlab-ci.yml            | 28 ++++++++++++++++++++++++++++
 doc/arm/platforms.inc.rst |  4 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdc04efcb1..dc0a9e12b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,6 +168,10 @@ stages:
   image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64"
   <<: *linux_amd64
 
+.ubuntu-jammy-amd64: &ubuntu_jammy_amd64_image
+  image: "$CI_REGISTRY_IMAGE:ubuntu-jammy-amd64"
+  <<: *linux_amd64
+
 # Base image
 # This is a meta image that is used as a base for non-specific jobs
 
@@ -920,6 +924,30 @@ unit:gcc:focal:amd64:
     - job: gcc:focal:amd64
       artifacts: true
 
+# Jobs for regular GCC builds on Ubuntu 22.04 Jammy Jellyfish (amd64)
+
+gcc:jammy:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "--with-libidn2"
+  <<: *ubuntu_jammy_amd64_image
+  <<: *build_job
+
+system:gcc:jammy:amd64:
+  <<: *ubuntu_jammy_amd64_image
+  <<: *system_test_job
+  needs:
+    - job: gcc:jammy:amd64
+      artifacts: true
+
+unit:gcc:jammy:amd64:
+  <<: *ubuntu_jammy_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: gcc:jammy:amd64
+      artifacts: true
+
 # Jobs for ASAN builds on Fedora 35 (amd64)
 
 gcc:asan:
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index ea888572c6..0c94995746 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -42,11 +42,11 @@ able to offer support on a “best-effort” basis for some.
 Regularly Tested Platforms
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As of April 2022, current versions of BIND 9 are fully supported and regularly tested on the
+As of June 2022, current versions of BIND 9 are fully supported and regularly tested on the
 following systems:
 
 -  Debian 9, 10, 11
--  Ubuntu LTS 18.04, 20.04
+-  Ubuntu LTS 18.04, 20.04, 22.04
 -  Fedora 35
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8
 -  FreeBSD 12.3, 13.0