From f75fed076e8f829997b92e7650bd5a224d669780 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 28 Oct 2021 16:47:08 +1100 Subject: [PATCH] fedora-container: update to Fedora 35 Support Fedora 35 in this element, and update the default Depends-On: https://review.opendev.org/c/zuul/nodepool/+/815766 Change-Id: I2a9a8648158e1e4b1a071e20266fb8d125da67ac --- .zuul.d/jobs.yaml | 4 ++-- .zuul.d/project.yaml | 4 ++-- diskimage_builder/elements/fedora-container/containerfiles/35 | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 diskimage_builder/elements/fedora-container/containerfiles/35 diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 38c311894..8f5814800 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -113,7 +113,7 @@ # mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" - job: - name: dib-nodepool-functional-openstack-fedora-34-containerfile-src + name: dib-nodepool-functional-openstack-fedora-35-containerfile-src description: | Test building and booting an Fedora image from a containerfile with Nodepool and OpenStack (using released @@ -124,7 +124,7 @@ nodepool_debug: true nodepool_diskimage: base_element: fedora-container - release: '34' + release: '35' - job: name: dib-nodepool-functional-openstack-ubuntu-xenial-src diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 7745a7cdb..339893212 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -18,7 +18,7 @@ - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-centos-8-stream-src - dib-nodepool-functional-openstack-centos-9-stream-src - - dib-nodepool-functional-openstack-fedora-34-containerfile-src + - dib-nodepool-functional-openstack-fedora-35-containerfile-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-nodepool-functional-openstack-ubuntu-focal-src @@ -48,7 +48,7 @@ - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-centos-8-stream-src - dib-nodepool-functional-openstack-centos-9-stream-src - - dib-nodepool-functional-openstack-fedora-34-containerfile-src + - dib-nodepool-functional-openstack-fedora-35-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/35 b/diskimage_builder/elements/fedora-container/containerfiles/35 new file mode 100644 index 000000000..863e24890 --- /dev/null +++ b/diskimage_builder/elements/fedora-container/containerfiles/35 @@ -0,0 +1,3 @@ +FROM docker.io/library/fedora:35 + +RUN dnf install -y findutils util-linux