From b6cdda4ab0d25eff665c8433b9d3b817410f1777 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 15 Mar 2023 14:33:51 +1100
Subject: [PATCH] Update Fedora to 37

This seems like a relatively simple update with nothing breaking
(famous last words).

Change-Id: I5498371ad5af3f0f053af633eb26121ea9f780e6
---
 .zuul.d/jobs.yaml                                             | 4 ++--
 .zuul.d/project.yaml                                          | 4 ++--
 diskimage_builder/elements/fedora-container/containerfiles/37 | 3 +++
 .../elements/fedora/environment.d/10-fedora-distro-name.bash  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 diskimage_builder/elements/fedora-container/containerfiles/37

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 0a7fad2d..3e4581be 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -120,7 +120,7 @@
         # mirror: "http://{{ zuul_site_mirror_fqdn }}/centos"
 
 - job:
-    name: dib-nodepool-functional-openstack-fedora-36-containerfile-src
+    name: dib-nodepool-functional-openstack-fedora-37-containerfile-src
     description: |
       Test building and booting an Fedora image from a
       containerfile with Nodepool and OpenStack (using released
@@ -130,7 +130,7 @@
       nodepool_debug: true
       nodepool_diskimage:
         base_element : fedora-container
-        release: '36'
+        release: '37'
 
 - job:
     name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index c1f4c153..aaeace97 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -36,7 +36,7 @@
         - dib-nodepool-functional-openstack-centos-7-src
         - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-fedora-36-containerfile-src
+        - dib-nodepool-functional-openstack-fedora-37-containerfile-src
         - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src:
             voting: false
         - dib-nodepool-functional-openstack-rockylinux-9-containerfile-src:
@@ -89,7 +89,7 @@
         - dib-nodepool-functional-openstack-centos-7-src
         - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-fedora-36-containerfile-src
+        - dib-nodepool-functional-openstack-fedora-37-containerfile-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
         - dib-nodepool-functional-openstack-ubuntu-focal-src
diff --git a/diskimage_builder/elements/fedora-container/containerfiles/37 b/diskimage_builder/elements/fedora-container/containerfiles/37
new file mode 100644
index 00000000..550d2b9d
--- /dev/null
+++ b/diskimage_builder/elements/fedora-container/containerfiles/37
@@ -0,0 +1,3 @@
+FROM docker.io/library/fedora:37
+
+RUN dnf install -y findutils util-linux
diff --git a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
index 78f0337e..bb138d5e 100644
--- a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
+++ b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
@@ -1,4 +1,4 @@
 export DISTRO_NAME=fedora
-export DIB_RELEASE=${DIB_RELEASE:-36}
+export DIB_RELEASE=${DIB_RELEASE:-37}
 export EFI_BOOT_DIR="EFI/fedora"