From 6b5d7e6da6b062525623b6f7843e3cf7b823a53a Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Tue, 23 Jan 2024 15:17:59 +1100
Subject: [PATCH] Fedora 37 EOL

---
 .github/workflows/bbw_build_container.yml | 3 ---
 ci_build_images/README.md                 | 4 ++--
 constants.py                              | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bbw_build_container.yml b/.github/workflows/bbw_build_container.yml
index 50bc1b40..3cc266c1 100644
--- a/.github/workflows/bbw_build_container.yml
+++ b/.github/workflows/bbw_build_container.yml
@@ -72,9 +72,6 @@ jobs:
             image: ubuntu:23.10
             branch: 10.11
             platforms: linux/amd64, linux/arm64/v8
-          - dockerfile: fedora.Dockerfile
-            image: fedora:37
-            platforms: linux/amd64, linux/arm64/v8
           - dockerfile: fedora.Dockerfile
             image: fedora:38
             platforms: linux/amd64, linux/arm64/v8
diff --git a/ci_build_images/README.md b/ci_build_images/README.md
index 2921d16a..349af582 100644
--- a/ci_build_images/README.md
+++ b/ci_build_images/README.md
@@ -10,10 +10,10 @@ cat debian.Dockerfile common.Dockerfile >Dockerfile
 docker build . -t mariadb.org/buildbot/debian:sid --build-arg mariadb_branch=10.7 --build-arg base_image=debian:sid
 # ubuntu
 cat debian.Dockerfile common.Dockerfile >Dockerfile
-docker build . -t mariadb.org/buildbot/ubuntu:21.04 --build-arg mariadb_branch=10.7 --build-arg base_image=ubuntu:22.04
+docker build . -t mariadb.org/buildbot/ubuntu:22.04 --build-arg mariadb_branch=10.7 --build-arg base_image=ubuntu:22.04
 # fedora
 cat fedora.Dockerfile common.Dockerfile >Dockerfile
-docker build . -t mariadb.org/buildbot/fedora:34 --build-arg base_image=fedora:37
+docker build . -t mariadb.org/buildbot/fedora:39 --build-arg base_image=fedora:39
 # rhel9
 cat rhel.Dockerfile common.Dockerfile >Dockerfile
 echo "12345_KEYNAME" >rhel_keyname
diff --git a/constants.py b/constants.py
index 5fa5aa04..7c2d7f5b 100644
--- a/constants.py
+++ b/constants.py
@@ -49,7 +49,7 @@
 builders_wordpress = ["amd64-rhel8-wordpress"]
 builders_galera_mtr = [
     "aarch64-debian-12",
-    "amd64-fedora-37",
+    "amd64-fedora-39",
     "amd64-ubuntu-2304",
     "s390x-ubuntu-2004",
     "s390x-ubuntu-2204",
@@ -109,7 +109,6 @@
 supportedPlatforms["10.5"] = [
     "aarch64-centos-stream9",
     "aarch64-debian-11",
-    "aarch64-fedora-37",
     "aarch64-fedora-38",
     "aarch64-fedora-39",
     "aarch64-rhel-9",
@@ -119,7 +118,6 @@
     "amd64-debian-11-msan",
     "amd64-debian-12-asan-ubsan",
     "amd64-debian-12-rocksdb",
-    "amd64-fedora-37",
     "amd64-fedora-38",
     "amd64-fedora-38-last-N-failed",
     "amd64-fedora-39",