From 4e73c5e1926d445e51bb377d68af7bdc13efacf8 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 17 Jan 2024 14:36:06 +1100
Subject: [PATCH] Add Ubuntu-24.04 noble

---
 .github/workflows/bbw_build_container.yml | 4 ++++
 ci_build_images/debian.Dockerfile         | 5 +++--
 os_info.yaml                              | 7 +++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bbw_build_container.yml b/.github/workflows/bbw_build_container.yml
index 3cc266c1..34279202 100644
--- a/.github/workflows/bbw_build_container.yml
+++ b/.github/workflows/bbw_build_container.yml
@@ -72,6 +72,10 @@ jobs:
             image: ubuntu:23.10
             branch: 10.11
             platforms: linux/amd64, linux/arm64/v8
+          - dockerfile: debian.Dockerfile
+            image: ubuntu:24.04
+            branch: 10.11
+            platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
           - dockerfile: fedora.Dockerfile
             image: fedora:38
             platforms: linux/amd64, linux/arm64/v8
diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile
index 8c4060b0..b84f36f0 100644
--- a/ci_build_images/debian.Dockerfile
+++ b/ci_build_images/debian.Dockerfile
@@ -30,8 +30,9 @@ RUN . /etc/os-release; \
     && if [ "${VERSION_ID}" = "20.04" ]; then apt-get -y install --no-install-recommends g++-10; fi \
     && if [ "$(arch)" = "x86_64" ]; then ARCH="amd64"; else ARCH=$(arch); fi \
     && curl -s "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" >/etc/apt/sources.list.d/galera-4.sources \
-    # VERSION_ID=13 once released \
-    && if [ "${VERSION_CODENAME}" = trixie ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \
+    # trixie VERSION_ID=13 once released \
+    # 24.04 noble - until galera build happens based on this image, then rebuild so galera tests can occur
+    && if [ "${VERSION_ID}" = 24.04 ] || [ "${VERSION_CODENAME}" = trixie ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \
     && apt-get update \
     && curl -skO https://raw.githubusercontent.com/MariaDB/server/44e4b93316be8df130c6d87880da3500d83dbe10/debian/control \
     && mkdir debian \
diff --git a/os_info.yaml b/os_info.yaml
index 354865eb..892acedb 100644
--- a/os_info.yaml
+++ b/os_info.yaml
@@ -152,3 +152,10 @@ ubuntu-2310:
     - aarch64
   type: deb
   has_install: False
+ubuntu-2404:
+  version_name: noble
+  arch:
+    - amd64
+    - aarch64
+    - ppc64le
+    - s390x