From 09c902e1fcc4a40012b96302fee2d7cd4041fb9d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 20 Feb 2025 16:57:08 -0500 Subject: [PATCH] tier-0: Rename to minimal The "tiers" nomenclature ended up being unhelpful since we introduced "tier-x" which is between tier-0 and tier-1. We also never exposed the tier naming outside of our source code. In preparation for doing so, rename to tier-0 to "minimal" which is a bit more descriptive. Renaming the other images will follow. Signed-off-by: Colin Walters --- .gitlab-ci.yml | 2 +- README.md | 11 +++++------ fedora-tier-0.yaml => fedora-minimal.yaml | 4 ++-- {tier-0 => minimal}/basic-fixes.yaml | 0 {tier-0 => minimal}/bootc.yaml | 0 {tier-0 => minimal}/bootupd.yaml | 0 {tier-0 => minimal}/finalize.d/01-var.sh | 0 {tier-0 => minimal}/group | 0 {tier-0 => minimal}/grub2-removals.yaml | 0 {tier-0 => minimal}/initramfs.yaml | 0 {tier-0 => minimal}/kernel-install.yaml | 0 {tier-0 => minimal}/kernel.yaml | 0 {tier-0 => minimal}/manifest.yaml | 2 +- {tier-0 => minimal}/ostree.yaml | 0 {tier-0 => minimal}/passwd | 0 {tier-0 => minimal}/postprocess-conf.yaml | 2 +- tier-x/manifest.yaml | 2 +- 17 files changed, 11 insertions(+), 12 deletions(-) rename fedora-tier-0.yaml => fedora-minimal.yaml (67%) rename {tier-0 => minimal}/basic-fixes.yaml (100%) rename {tier-0 => minimal}/bootc.yaml (100%) rename {tier-0 => minimal}/bootupd.yaml (100%) rename {tier-0 => minimal}/finalize.d/01-var.sh (100%) rename {tier-0 => minimal}/group (100%) rename {tier-0 => minimal}/grub2-removals.yaml (100%) rename {tier-0 => minimal}/initramfs.yaml (100%) rename {tier-0 => minimal}/kernel-install.yaml (100%) rename {tier-0 => minimal}/kernel.yaml (100%) rename {tier-0 => minimal}/manifest.yaml (93%) rename {tier-0 => minimal}/ostree.yaml (100%) rename {tier-0 => minimal}/passwd (100%) rename {tier-0 => minimal}/postprocess-conf.yaml (91%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb0af33..4315f08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ build-image: extends: .build-image parallel: matrix: - - TIER: [tier-0, tier-1, tier-x] + - TIER: [minimal, tier-1, tier-x] variables: EXTRA_ARGS: "--security-opt=label=disable --cap-add=all --build-arg MANIFEST=fedora-$TIER.yaml" rules: diff --git a/README.md b/README.md index c4ddc9f..4d82095 100644 --- a/README.md +++ b/README.md @@ -60,19 +60,18 @@ to support smaller custom images. For more on this, see - **tier-1**: This image is the default, what is published as https://quay.io/repository/fedora/fedora-bootc -- **tier-0**: This content set is more of a convenient centralization point for CI - and curation around a package set that we can all agree is the rough minimum - necessary for a usable system. It's not meant to be used as is, but layered - upon. +- **minimal**: This content set is more of a convenient centralization point for CI + and curation around a package set that is intended as a starting point fror + a container base image. - **tier-x**: This content set is the shared base used by all image-based Fedora variants (IoT, Atomic Desktops, and CoreOS). Changes to this tier may be done without accounting for external users. To build this, pass `--build-arg=MANIFEST=fedora-tier-x.yaml` to the build command above. -**tier-1** inherits from **tier-x** and **tier-x** in turn inherit from **tier-0**. +**tier-1** inherits from **tier-x** and **tier-x** in turn inherit from **minimal**. -All non-trivial changes to **tier-0** and **tier-x** should be ACKed by at least +All non-trivial changes to **minimal** and **tier-x** should be ACKed by at least one stakeholder of each Fedora variant WGs. ## More information diff --git a/fedora-tier-0.yaml b/fedora-minimal.yaml similarity index 67% rename from fedora-tier-0.yaml rename to fedora-minimal.yaml index 6cef2a1..77cd0e2 100644 --- a/fedora-tier-0.yaml +++ b/fedora-minimal.yaml @@ -4,5 +4,5 @@ metadata: include: - fedora-generic.yaml - - tier-0/manifest.yaml - - tier-0/kernel.yaml + - minimal/manifest.yaml + - minimal/kernel.yaml diff --git a/tier-0/basic-fixes.yaml b/minimal/basic-fixes.yaml similarity index 100% rename from tier-0/basic-fixes.yaml rename to minimal/basic-fixes.yaml diff --git a/tier-0/bootc.yaml b/minimal/bootc.yaml similarity index 100% rename from tier-0/bootc.yaml rename to minimal/bootc.yaml diff --git a/tier-0/bootupd.yaml b/minimal/bootupd.yaml similarity index 100% rename from tier-0/bootupd.yaml rename to minimal/bootupd.yaml diff --git a/tier-0/finalize.d/01-var.sh b/minimal/finalize.d/01-var.sh similarity index 100% rename from tier-0/finalize.d/01-var.sh rename to minimal/finalize.d/01-var.sh diff --git a/tier-0/group b/minimal/group similarity index 100% rename from tier-0/group rename to minimal/group diff --git a/tier-0/grub2-removals.yaml b/minimal/grub2-removals.yaml similarity index 100% rename from tier-0/grub2-removals.yaml rename to minimal/grub2-removals.yaml diff --git a/tier-0/initramfs.yaml b/minimal/initramfs.yaml similarity index 100% rename from tier-0/initramfs.yaml rename to minimal/initramfs.yaml diff --git a/tier-0/kernel-install.yaml b/minimal/kernel-install.yaml similarity index 100% rename from tier-0/kernel-install.yaml rename to minimal/kernel-install.yaml diff --git a/tier-0/kernel.yaml b/minimal/kernel.yaml similarity index 100% rename from tier-0/kernel.yaml rename to minimal/kernel.yaml diff --git a/tier-0/manifest.yaml b/minimal/manifest.yaml similarity index 93% rename from tier-0/manifest.yaml rename to minimal/manifest.yaml index a531a15..13f6f71 100644 --- a/tier-0/manifest.yaml +++ b/minimal/manifest.yaml @@ -30,7 +30,7 @@ packages: # in dnf5. In CentOS/RHEL, this pulls in dnf(4). We can simplify this back to # just `dnf` once the `dnf` package is retired from Fedora. - /usr/bin/dnf - # Even in tier-0, we have this. If you don't want SELinux today, you'll need + # Even in minimal, we have this. If you don't want SELinux today, you'll need # to build a custom image. - selinux-policy-targeted # And we want container-selinux because trying to layer it on later currently causes issues. diff --git a/tier-0/ostree.yaml b/minimal/ostree.yaml similarity index 100% rename from tier-0/ostree.yaml rename to minimal/ostree.yaml diff --git a/tier-0/passwd b/minimal/passwd similarity index 100% rename from tier-0/passwd rename to minimal/passwd diff --git a/tier-0/postprocess-conf.yaml b/minimal/postprocess-conf.yaml similarity index 91% rename from tier-0/postprocess-conf.yaml rename to minimal/postprocess-conf.yaml index d11f4ee..ae5f7e7 100644 --- a/tier-0/postprocess-conf.yaml +++ b/minimal/postprocess-conf.yaml @@ -7,7 +7,7 @@ opt-usrlocal: "root" machineid-compat: true # Note that the default for c9s+ is sqlite; we can't rely on rpm being -# in the target (it isn't in tier-0!) so turn this to host here. This +# in the target (it isn't in minimal!) so turn this to host here. This # does break the "hermetic build" aspect a bit. Maybe eventually # what we should do is special case this and actually install RPM temporarily # and then remove it... diff --git a/tier-x/manifest.yaml b/tier-x/manifest.yaml index 2b2cf68..e5275d5 100644 --- a/tier-x/manifest.yaml +++ b/tier-x/manifest.yaml @@ -1,5 +1,5 @@ include: - - ../tier-0/manifest.yaml + - ../minimal/manifest.yaml packages: # Used by admins interactively