It's not entirely obvious, but these were not in fact tied to the
old livemedia phase as 087fe9f thought; they are used by modern
phases like imagebuilder and kiwi as well. Restore them, with a
less misleading comment.
Fixes: https://github.com/fedora-iot/iot-distro/issues/131
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This fixes the container names to reflect the content in the image.
Fedora-IoT-bootc - iot image
Fedora-base-bootc - generic base image
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
The generic bootc container was added to the IoT section of the compose,
since then s390x and ppc64le have started to fail. This adds those arches
to the IoT section in variant.xml and removes the old variants.
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
There's substantial history here, including
https://pagure.io/fedora-infra/ansible/pull-request/2295 and
the discussion in the PR for this commit -
https://pagure.io/fedora-iot/pungi-iot/pull-request/102 . This
is trying to make the metadata for these images accurate and
informative.
With this change, the variant for both images will be "IoT" and
they will both appear in the IoT directory in the tree. The IoT
image's subvariant will also be "IoT". The base image's
subvariant will be "base". The format for both images will be
"ociarchive", as it currently is. From tomorrow, the type for
both images will be "bootable-container". The filename for the
IoT image will start with "Fedora-IoT-bootc", and the filename
for the base image will start with "Fedora-base-bootc". So we
will have these basename - subvariant - type - formats:
* Fedora-IoT-bootc - IoT - bootable-container - ociarchive
* Fedora-base-bootc - base - bootable-container - ociarchive
The base image can easily be moved into the main compose and
maintain the same filename base, subvariant, type and format. It
would have a different variant in that case, but in practice we
do not use the variant for image identification purposes much
anyway.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
As discussed in https://gitlab.com/fedora/bootc/tracker/-/issues/39,
we will be maintaining all Fedora versions in the `main` branch going
forward. The `fedora-bootc.yaml` file upstream is now version-less. To
not break pungi, we need it to use the stub treefile we added that sets
the releasever to rawhide.
As discussed in
https://pagure.io/fedora-infra/ansible/pull-request/2295 , this
subvariant is more usable and in line with previous practice. It
will make life a bit easier for fedora-image-uploader. This also
tweaks the config to build both ostree container images in the
IoT variant and give them explicit subvariants, instead of
building them in their own variants and relying on the variant
to be inherited as the subvariant definition too. This just
seems a bit cleaner and avoids these variants showing up in the
metadata, which reads a bit oddly.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Add script to push containers to registries, run the script
at the end of the compose process to push the container
manifests to the fedora container registries.
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
