Skip to content

Revert "butane: replace LAYOUT with architecture before render" #4550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
travier wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −3
Open

Revert "butane: replace LAYOUT with architecture before render" #4550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions mantle/kola/harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,9 +1405,7 @@ func registerTestDir(dir, testprefix string, children []os.DirEntry) error {
if err != nil {
return errors.Wrapf(err, "reading %s", c.Name())
}
// The .Subst("{{LAYOUT}}") is required for raid1-boot test, see
// https://github.com/coreos/fedora-coreos-config/pull/4097
userdata = conf.Butane(string(v)).Subst("{{LAYOUT}}", Options.CosaBuildArch)
userdata = conf.Butane(string(v))
} else if isreg && c.Name() == "kola.json" {
f, err := os.Open(fpath)
if err != nil {
Expand Down