Skip to content

butane: replace LAYOUT with architecture before render#4525

Merged
dustymabe merged 1 commit intocoreos:mainfrom
HuijingHei:butane-config
Apr 9, 2026
Merged

butane: replace LAYOUT with architecture before render#4525
dustymabe merged 1 commit intocoreos:mainfrom
HuijingHei:butane-config

Conversation

@HuijingHei
Copy link
Copy Markdown
Contributor

Fix failed test on aarch64 / ppc64le.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces architecture-based substitution for Butane configurations in kola qemuexec and test registration, defaulting to the current RPM architecture when none is provided. Feedback suggests refactoring the manual string replacement logic to use the existing Subst method for better consistency and readability. It is also recommended to use a more unique placeholder than 'LAYOUT' to avoid unintended replacements in configuration files.

Comment thread mantle/cmd/kola/qemuexec.go Outdated
Comment thread mantle/kola/harness.go Outdated
HuijingHei added a commit to HuijingHei/fedora-coreos-config that referenced this pull request Apr 8, 2026
The test failed on aarch64 / ppc64le because of missing `layout`.

Requires coreos/coreos-assembler#4525
@HuijingHei HuijingHei force-pushed the butane-config branch 2 times, most recently from cdc1e29 to da72067 Compare April 8, 2026 11:25
HuijingHei added a commit to HuijingHei/fedora-coreos-config that referenced this pull request Apr 8, 2026
The test failed on aarch64 / ppc64le because of missing `layout`.

Requires coreos/coreos-assembler#4525
@HuijingHei
Copy link
Copy Markdown
Contributor Author

Test passed on x86_64 and aarch64 with coreos/fedora-coreos-config#4097

$ kola run --qemu-image data/fedora-coreos-43.20260405.20.1-qemu.x86_64.qcow2 -E fedora-coreos-config/ ext.fedora-coreos-config.boot.raid1-boot
=== RUN   ext.fedora-coreos-config.boot.raid1-boot
--- PASS: ext.fedora-coreos-config.boot.raid1-boot (164.34s)
PASS, output in _kola_temp/qemu-2026-04-08-1135-39612
[builder@coreos-aarch64-builder debug-pod]$ kola run ext.config.boot.raid1-boot --qemu-image builds/43.20260316.3.1/aarch64/fedora-coreos-43.20260316.3.1-qemu.aarch64.qcow2 
=== RUN   ext.config.boot.raid1-boot
--- PASS: ext.config.boot.raid1-boot (143.46s)
PASS, output in tmp/kola/qemu-2026-04-08-1137-34883

@HuijingHei HuijingHei requested a review from Rolv-Apneseth April 8, 2026 11:43
HuijingHei added a commit to HuijingHei/fedora-coreos-config that referenced this pull request Apr 8, 2026
The test failed on aarch64 / ppc64le because of missing `layout`.

Requires coreos/coreos-assembler#4525
Rolv-Apneseth
Rolv-Apneseth previously approved these changes Apr 8, 2026
Copy link
Copy Markdown
Member

@Rolv-Apneseth Rolv-Apneseth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Not entirely familiar with the kola code base but changes look reasonable and the modified test works.

Comment thread mantle/cmd/kola/qemuexec.go
Comment thread mantle/kola/harness.go
HuijingHei added a commit to HuijingHei/fedora-coreos-config that referenced this pull request Apr 9, 2026
Fix test failed on aarch64 / ppc64le because of missing `layout`.

Requires coreos/coreos-assembler#4525
@HuijingHei HuijingHei requested a review from dustymabe April 9, 2026 01:28
@HuijingHei HuijingHei enabled auto-merge (rebase) April 9, 2026 01:28
Comment thread mantle/kola/harness.go Outdated
Fix failed test on aarch64 / ppc64le, the `.Subst("{{LAYOUT}}")`
is required for `raid1-boot` test, see coreos/fedora-coreos-config#4097
auto-merge was automatically disabled April 9, 2026 02:28

Head branch was pushed to by a user without write access

Copy link
Copy Markdown
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dustymabe dustymabe enabled auto-merge (rebase) April 9, 2026 02:54
@dustymabe
Copy link
Copy Markdown
Member

not sure what is up with prow

/retest

@dustymabe dustymabe merged commit 7338b38 into coreos:main Apr 9, 2026
4 of 5 checks passed
dustymabe pushed a commit to coreos/fedora-coreos-config that referenced this pull request Apr 9, 2026
Fix test failed on aarch64 / ppc64le because of missing `layout`.

Requires coreos/coreos-assembler#4525
Rolv-Apneseth pushed a commit to Rolv-Apneseth/fedora-coreos-config that referenced this pull request Apr 16, 2026
Fix test failed on aarch64 / ppc64le because of missing `layout`.

Requires coreos/coreos-assembler#4525
HuijingHei added a commit to HuijingHei/bootupd that referenced this pull request Apr 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants