Merge "Add fedora-containerfile element"

.zuul.d/jobs.yaml

@@ -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

.zuul.d/project.yaml

@@ -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

diskimage_builder/elements/fedora-container/README.rst

@@ -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.

diskimage_builder/elements/fedora-container/containerfiles/34

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

diskimage_builder/elements/fedora-container/element-deps

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

diskimage_builder/elements/fedora-container/environment.d/10-01-fedora-distro-name.bash

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

diskimage_builder/elements/fedora-container/environment.d/11-yum-dnf.bash

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

diskimage_builder/elements/fedora-container/package-installs.yaml

@@ -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:

diskimage_builder/elements/fedora-container/pkg-map

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

diskimage_builder/elements/fedora-container/test-elements/build-succeeds/README.rst

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

diskimage_builder/elements/fedora-container/test-elements/build-succeeds/element-deps

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