From 4178c04fe87b609ce446879e6e8ad353bc471b6c Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Tue, 5 Mar 2024 17:00:18 +1100
Subject: [PATCH] Lunar 23.04 eol

---
 .github/workflows/bbw_build_container.yml | 4 ----
 constants.py                              | 3 ---
 master-config.yaml-sample                 | 2 +-
 os_info.yaml                              | 7 -------
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/bbw_build_container.yml b/.github/workflows/bbw_build_container.yml
index d80b9e5b..b10e1fa1 100644
--- a/.github/workflows/bbw_build_container.yml
+++ b/.github/workflows/bbw_build_container.yml
@@ -82,10 +82,6 @@ jobs:
             image: ubuntu:22.04
             branch: 10.11
             platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
-          - dockerfile: debian.Dockerfile
-            image: ubuntu:23.04
-            branch: 10.11
-            platforms: linux/amd64, linux/arm64/v8
           - dockerfile: debian.Dockerfile
             image: ubuntu:23.10
             branch: 10.11
diff --git a/constants.py b/constants.py
index a251baf3..a16fcab4 100644
--- a/constants.py
+++ b/constants.py
@@ -50,7 +50,6 @@
 builders_galera_mtr = [
     "aarch64-debian-12",
     "amd64-fedora-39",
-    "amd64-ubuntu-2304",
     "s390x-ubuntu-2004",
     "s390x-ubuntu-2204",
     "ppc64le-ubuntu-2004",
@@ -157,11 +156,9 @@
 supportedPlatforms["10.11"] = [
     "aarch64-debian-12",
     "aarch64-debian-sid",
-    "aarch64-ubuntu-2304",
     "aarch64-ubuntu-2310",
     "amd64-debian-12",
     "amd64-debian-sid",
-    "amd64-ubuntu-2304",
     "amd64-ubuntu-2310",
     "ppc64le-debian-sid",
     "x86-debian-sid",
diff --git a/master-config.yaml-sample b/master-config.yaml-sample
index a73d1e09..63dc182f 100644
--- a/master-config.yaml-sample
+++ b/master-config.yaml-sample
@@ -10,7 +10,7 @@ builders:
 - aarch64-rhel-9
 - aarch64-ubuntu-2004
 - aarch64-ubuntu-2204
-- aarch64-ubuntu-2304
+- aarch64-ubuntu-2310
 log_name: master-docker-aarch64-0.log
 port: 9998
 workers:
diff --git a/os_info.yaml b/os_info.yaml
index 83bc2e6a..2a83315e 100644
--- a/os_info.yaml
+++ b/os_info.yaml
@@ -140,13 +140,6 @@ ubuntu-2204:
     - ppc64le
     - s390x
   type: deb
-ubuntu-2304:
-  version_name: lunar
-  arch:
-    - amd64
-    - aarch64
-  type: deb
-  has_install: False
 ubuntu-2310:
   version_name: mantic
   arch: