Rename tier-x → minimal-plus

When we renamed tier-0 → minimal and tier-1 → standard, the
naming of tier-x became obsolete. Complete the nomenclature
update.

Closes: https://gitlab.com/fedora/bootc/base-images/-/issues/24
Signed-off-by: Colin Walters <walters@verbum.org>

.gitlab-ci.yml

@@ -17,6 +17,14 @@ build-minimal:
     buildah build -f Containerfile --no-cache -t localhost/fedora-bootc:minimal ${PRIV_ARGS} --build-arg=manifest=fedora-minimal .
     cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal    
 
+build-minimal-plus:
+  extends: .build-image
+  script: |
+    set -xeuo pipefail
+    buildah build -f Containerfile --no-cache -t localhost/fedora-bootc:minimal-plus ${PRIV_ARGS} --build-arg=manifest=fedora-minimal-plus .
+    cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal-plus
+
+
 standard-build-and-test:
   extends: .build-image
   script: |

README.md

@@ -63,15 +63,12 @@ to support smaller custom images. For more on this, see
 - **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
+- **minimal-plus**: This content set is intended to be 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.
 
-**standard** inherits from **tier-x** and **tier-x** in turn inherit from **minimal**.
+**standard** inherits from **minimal-plus** and **minimal-plus** in turn inherit from **minimal**.
 
-All non-trivial changes to **minimal** and **tier-x** should be ACKed by at least
+All non-trivial changes to **minimal** and **minimal-plus** should be ACKed by at least
 one stakeholder of each Fedora variant WGs.
 
 ## More information

fedora-minimal-plus.yaml

@@ -1,3 +1,3 @@
 include:
   - fedora-includes/generic.yaml
-  - tier-x/manifest.yaml
+  - minimal-plus/manifest.yaml

install-manifests

@@ -4,7 +4,7 @@ set -xeuo pipefail
 # into their installed location.
 manifestdir=${1:-/usr/share/doc/bootc-base-imagectl/manifests}
 mkdir -p "$manifestdir/"
-for image in minimal standard tier-x; do
+for image in minimal standard minimal-plus; do
     # Embed the generic defaults
     cp -a $image $manifestdir/
     # And the Fedora-specific tweaks

minimal-plus/manifest.yaml

@@ -1,10 +1,7 @@
 metadata:
   summary: |
-    A relatively full, but still generic base image. Roughly
-    similar to a smaller Fedora CoreOS. Includes NetworkManager,
-    openssh, various CLI tools, etc.
-    
-    Automatic updates are not on by default.
+    This content set is intended to be the shared base used by all image-based
+    Fedora variants (IoT, Atomic Desktops, and CoreOS).
 
 include:
   - ../minimal/manifest.yaml

standard/manifest.yaml

@@ -8,7 +8,7 @@ metadata:
 recommends: true
 
 include:
-  - ../tier-x/manifest.yaml
+  - ../minimal-plus/manifest.yaml
   - autoupdates.yaml
   - networking-tools.yaml
   - system-configuration.yaml