Browse Source

Merge "Add fedora-containerfile element"

changes/88/791888/1
Zuul 4 weeks ago
committed by Gerrit Code Review
parent
commit
d355bafda5
11 changed files with 72 additions and 6 deletions
  1. +9
    -4
      .zuul.d/jobs.yaml
  2. +2
    -2
      .zuul.d/project.yaml
  3. +9
    -0
      diskimage_builder/elements/fedora-container/README.rst
  4. +3
    -0
      diskimage_builder/elements/fedora-container/containerfiles/34
  5. +6
    -0
      diskimage_builder/elements/fedora-container/element-deps
  6. +2
    -0
      diskimage_builder/elements/fedora-container/environment.d/10-01-fedora-distro-name.bash
  7. +1
    -0
      diskimage_builder/elements/fedora-container/environment.d/11-yum-dnf.bash
  8. +20
    -0
      diskimage_builder/elements/fedora-container/package-installs.yaml
  9. +16
    -0
      diskimage_builder/elements/fedora-container/pkg-map
  10. +1
    -0
      diskimage_builder/elements/fedora-container/test-elements/build-succeeds/README.rst
  11. +3
    -0
      diskimage_builder/elements/fedora-container/test-elements/build-succeeds/element-deps

+ 9
- 4
.zuul.d/jobs.yaml View File

@ -30,6 +30,7 @@
- ubuntu-minimal/bionic-build-succeeds
- ubuntu-minimal/focal-build-succeeds
- containerfile/focal-build-succeeds
- fedora-container/build-succeeds
- job:
name: dib-functests-image
@ -180,14 +181,18 @@
# mirror: "http://{{ zuul_site_mirror_fqdn }}/centos"
- job:
name: dib-nodepool-functional-openstack-fedora-32-src
name: dib-nodepool-functional-openstack-fedora-34-containerfile-src
description: |
Test building and booting a Fedora 32 image with Nodepool and OpenStack
Test building and booting an Fedora image from a
containerfile with Nodepool and OpenStack (using released
libraries)
parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml
vars:
nodepool_debug: true
nodepool_diskimage:
base_element: fedora-minimal
release: '32'
base_element: fedora-container
release: '34'
- job:
name: dib-nodepool-functional-openstack-ubuntu-xenial-src


+ 2
- 2
.zuul.d/project.yaml View File

@ -17,7 +17,7 @@
- dib-nodepool-functional-openstack-centos-7-src
- dib-nodepool-functional-openstack-centos-8-src
- dib-nodepool-functional-openstack-centos-8-stream-src
- dib-nodepool-functional-openstack-fedora-32-src
- dib-nodepool-functional-openstack-fedora-34-containerfile-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src
- dib-nodepool-functional-openstack-ubuntu-bionic-src
- dib-nodepool-functional-openstack-ubuntu-focal-src
@ -46,7 +46,7 @@
- dib-nodepool-functional-openstack-centos-7-src
- dib-nodepool-functional-openstack-centos-8-src
- dib-nodepool-functional-openstack-centos-8-stream-src
- dib-nodepool-functional-openstack-fedora-32-src
- dib-nodepool-functional-openstack-fedora-34-containerfile-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src
- dib-nodepool-functional-openstack-ubuntu-bionic-src
- dib-nodepool-functional-openstack-ubuntu-focal-src


+ 9
- 0
diskimage_builder/elements/fedora-container/README.rst View File

@ -0,0 +1,9 @@
================
fedora-container
================
Create a minimal image based on Fedora container image
This element sets the ``DIB_RELEASE`` var to 'fedora'. The release of
fedora to be installed can be controlled through the ``DIB_RELEASE``
variable, which defaults the latest supported release.

+ 3
- 0
diskimage_builder/elements/fedora-container/containerfiles/34 View File

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

+ 6
- 0
diskimage_builder/elements/fedora-container/element-deps View File

@ -0,0 +1,6 @@
containerfile
package-installs
redhat-common
rpm-distro
vm
yum

+ 2
- 0
diskimage_builder/elements/fedora-container/environment.d/10-01-fedora-distro-name.bash View File

@ -0,0 +1,2 @@
export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-34}

+ 1
- 0
diskimage_builder/elements/fedora-container/environment.d/11-yum-dnf.bash View File

@ -0,0 +1 @@
export YUM=dnf

+ 20
- 0
diskimage_builder/elements/fedora-container/package-installs.yaml View File

@ -0,0 +1,20 @@
audit:
dracut:
dracut-config-generic:
grubby:
kernel:
initscripts:
man-pages:
lsb_release:
redhat-rpm-config:
linux-firmware:
uninstall: true
linux-firmware-whence:
uninstall: true
# NOTE(ianw) pkg-map restricts this to !rhel/centos 7; in 7
# the "initscripts" package handles basic networking, in
# 8+ it's the role of NetworkManager and dhcp-client. This
# mirrors the default packages installed in upstream cloud images
# to facilitate a basic network.
NetworkManager:
dhcp-client:

+ 16
- 0
diskimage_builder/elements/fedora-container/pkg-map View File

@ -0,0 +1,16 @@
{
"release": {
"centos": {
"7": {
"NetworkManager": "",
"dhcp-client": ""
}
}
},
"family": {
"redhat": {
"lsb_release": "redhat-lsb-core"
}
}
}

+ 1
- 0
diskimage_builder/elements/fedora-container/test-elements/build-succeeds/README.rst View File

@ -0,0 +1 @@
Verify we can build a fedora-container image.

+ 3
- 0
diskimage_builder/elements/fedora-container/test-elements/build-succeeds/element-deps View File

@ -0,0 +1,3 @@
block-device-gpt
openstack-ci-mirrors
vm

Loading…
Cancel
Save