Revert "butane: replace LAYOUT with architecture before render"

[travier]

Reverts #4525

This changes does not work for coreos/fedora-coreos-config#4097 (reverted in coreos/fedora-coreos-config#4101) as the Butane config is parsed before the check to not run on s390x is done.

[gemini-code-assist]

Code Review

This pull request simplifies the registerTestDir function in mantle/kola/harness.go by removing the manual substitution of the {{LAYOUT}} placeholder in Butane configurations and the corresponding comment. I have no feedback to provide.

[angelcerveraroldan]

lgtm

[Rolv-Apneseth]

We dropped this from fedora-coreos-config but it's still used in bootupd: https://github.com/coreos/bootupd/blob/main/tests/kola/raid1/config.bu

[Rolv-Apneseth]

I was gonna do the same split over there as we did for fcos, but is it actually worth having it duplicated? Can we just run fcos tests in the bootupd CI? I assume it's just a modification to this line

Edit: Regardless, we can probably revert that {{LAYOUT}} commit in bootupd anyway. I think the CI only runs against x86_64 hence why it wasn't a problem before.

[travier]

Good catch. I agree that we should be able to remove the kola test from the bootupd repo now that it is in the main fedora-coreos-config one. I was looking for an example run but the CI is failing on the bootupd repo right now.

[Rolv-Apneseth]

Good catch. I agree that we should be able to remove the kola test from the bootupd repo now that it is in the main fedora-coreos-config one. I was looking for an example run but the CI is failing on the bootupd repo right now.

Yeah, I believe @yasminvalim is looking into it at the moment

[Rolv-Apneseth]

Created coreos/bootupd#1100 for tracking that failing CI in bootupd

[Rolv-Apneseth]

That issue is now closed.

Looking at the CI in coreos/bootupd#1091 we can see that the pattern on that previously linked line (ext.*bootupd*) ends up running tests from bootupd and fedora-coreos-config:

[2026-05-28T13:36:21.359Z] + cosa kola run --rerun --allow-rerun-success=tags=needs-internet --build=latest --output-dir=/home/jenkins/agent/workspace/bootupd_PR-1091/tmp/kola-3Vxns/kola --on-warn-failure-exit-77 --arch=x86_64 --exttest /var/tmp/kola/bootupd --inst-insecure 'ext.*bootupd*' --qemu-firmware=uefi --parallel=auto
[2026-05-28T13:36:21.359Z] kola -p qemu --build latest run --rerun --allow-rerun-success=tags=needs-internet --on-warn-failure-exit-77 --arch=x86_64 --exttest /var/tmp/kola/bootupd --inst-insecure ext.*bootupd* --qemu-firmware=uefi --parallel=auto --output-dir /home/jenkins/agent/workspace/bootupd_PR-1091/tmp/kola-3Vxns/kola
[2026-05-28T13:36:21.614Z] === RUN   ext.bootupd.raid1
[2026-05-28T13:36:21.614Z] === RUN   ext.bootupd.test-bootupd
[2026-05-28T13:36:21.614Z] === RUN   ext.config.boot.bootupd-validate
[2026-05-28T13:36:21.614Z] === RUN   ext.config.boot.bootupd

Could we just update this to ext.*boot*, and also run a couple more of the boot-related tests?

Edit: looks like that would match a few tests that aren't relevant, e.g. ext.config.systemd.no-systemd-firstboot. I guess we split it into 2 patterns with ext.bootupd.* and ext.config.boot.*?

[travier]

Edit: looks like that would match a few tests that aren't relevant, e.g. ext.config.systemd.no-systemd-firstboot. I guess we split it into 2 patterns with ext.bootupd.* and ext.config.boot.*?

Sounds good to me

[Rolv-Apneseth]

After coreos/bootupd#1104 is merged this should be safe to merge too

[Rolv-Apneseth]

LGTM