From 0385857cd991e12f124f64ddd9bd7ce2bda0214d Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 9 Jun 2022 14:39:03 +1000 Subject: [PATCH] Add Fedora 36 support Change-Id: I89ff95604aabf59217382bc784783759191c59a3 --- .zuul.d/jobs.yaml | 6 +++--- .zuul.d/project.yaml | 4 ++-- .../elements/fedora-container/containerfiles/36 | 3 +++ diskimage_builder/elements/fedora/README.rst | 2 +- .../fedora/environment.d/10-fedora-distro-name.bash | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 diskimage_builder/elements/fedora-container/containerfiles/36 diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index f6391be9b..b895faf85 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -115,7 +115,7 @@ # mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" - job: - name: dib-nodepool-functional-openstack-fedora-35-containerfile-src + name: dib-nodepool-functional-openstack-fedora-36-containerfile-src description: | Test building and booting an Fedora image from a containerfile with Nodepool and OpenStack (using released @@ -124,8 +124,8 @@ vars: nodepool_debug: true nodepool_diskimage: - base_element: fedora-container - release: '35' + base_element : fedora-container + release: '36' - job: name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 3892bcf13..1dcd0f9b9 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -17,7 +17,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-35-containerfile-src + - dib-nodepool-functional-openstack-fedora-36-containerfile-src - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src: voting: false - dib-nodepool-functional-openstack-ubuntu-xenial-src @@ -50,7 +50,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-35-containerfile-src + - dib-nodepool-functional-openstack-fedora-36-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/36 b/diskimage_builder/elements/fedora-container/containerfiles/36 new file mode 100644 index 000000000..b17df72e9 --- /dev/null +++ b/diskimage_builder/elements/fedora-container/containerfiles/36 @@ -0,0 +1,3 @@ +FROM docker.io/library/fedora:36 + +RUN dnf install -y findutils util-linux diff --git a/diskimage_builder/elements/fedora/README.rst b/diskimage_builder/elements/fedora/README.rst index 689c35ba9..24ac87d50 100644 --- a/diskimage_builder/elements/fedora/README.rst +++ b/diskimage_builder/elements/fedora/README.rst @@ -10,7 +10,7 @@ Releases This element targets the current and previous version of Fedora; these values clearly changes over time. To fix the version set the -`DIB_RELEASE` variable to the Fedora version (e.g. ``35``). The +`DIB_RELEASE` variable to the Fedora version (e.g. ``36``). The default value is the current best supported version (i.e. it may change upward at any given release to support the next Fedora). 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 3d88a9a51..78f0337e2 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:-35} +export DIB_RELEASE=${DIB_RELEASE:-36} export EFI_BOOT_DIR="EFI/fedora"