sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add Fedora 36 support"

Browse Source
This commit is contained in:
Zuul 2022-06-21 23:42:21 +00:00 committed by Gerrit Code Review
commit cdf931d190
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.d/jobs.yaml
View File

@ -115,7 +115,7 @@
# mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" # mirror: "http://{{ zuul_site_mirror_fqdn }}/centos"
- job: - job:
name: dib-nodepool-functional-openstack-fedora-35-containerfile-src name: dib-nodepool-functional-openstack-fedora-36-containerfile-src
description: | description: |
Test building and booting an Fedora image from a Test building and booting an Fedora image from a
containerfile with Nodepool and OpenStack (using released containerfile with Nodepool and OpenStack (using released
@ -124,8 +124,8 @@
vars: vars:
nodepool_debug: true nodepool_debug: true
nodepool_diskimage: nodepool_diskimage:
base_element: fedora-container base_element : fedora-container
release: '35' release: '36'
- job: - job:
name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src

4
.zuul.d/project.yaml
View File

@ -28,7 +28,7 @@
- dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-centos-7-src
- dib-nodepool-functional-openstack-centos-8-stream-src - dib-nodepool-functional-openstack-centos-8-stream-src
- dib-nodepool-functional-openstack-centos-9-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: - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src:
voting: false voting: false
- dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-xenial-src
@ -71,7 +71,7 @@
- dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-centos-7-src
- dib-nodepool-functional-openstack-centos-8-stream-src - dib-nodepool-functional-openstack-centos-8-stream-src
- dib-nodepool-functional-openstack-centos-9-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-xenial-src
- dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-nodepool-functional-openstack-ubuntu-bionic-src
- dib-nodepool-functional-openstack-ubuntu-focal-src - dib-nodepool-functional-openstack-ubuntu-focal-src

3
diskimage_builder/elements/fedora-container/containerfiles/36 Normal file
View File

@ -0,0 +1,3 @@
FROM docker.io/library/fedora:36
RUN dnf install -y findutils util-linux

2
diskimage_builder/elements/fedora/README.rst
View File

@ -10,7 +10,7 @@ Releases
This element targets the current and previous version of Fedora; these This element targets the current and previous version of Fedora; these
values clearly changes over time. To fix the version set the 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 default value is the current best supported version (i.e. it may
change upward at any given release to support the next Fedora). change upward at any given release to support the next Fedora).

2
diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
View File

@ -1,4 +1,4 @@
export DISTRO_NAME=fedora export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-35} export DIB_RELEASE=${DIB_RELEASE:-36}
export EFI_BOOT_DIR="EFI/fedora" export EFI_BOOT_DIR="EFI/fedora"