Skip to content

Commit 7338b38

Browse files
HuijingHeidustymabe
authored andcommitted
butane: replace LAYOUT with architecture before render
Fix failed test on aarch64 / ppc64le, the `.Subst("{{LAYOUT}}")` is required for `raid1-boot` test, see coreos/fedora-coreos-config#4097
1 parent 6b3ccc9 commit 7338b38

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

mantle/kola/harness.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,9 @@ func registerTestDir(dir, testprefix string, children []os.DirEntry) error {
13741374
if err != nil {
13751375
return errors.Wrapf(err, "reading %s", c.Name())
13761376
}
1377-
userdata = conf.Butane(string(v))
1377+
// The .Subst("{{LAYOUT}}") is required for raid1-boot test, see
1378+
// https://github.com/coreos/fedora-coreos-config/pull/4097
1379+
userdata = conf.Butane(string(v)).Subst("{{LAYOUT}}", Options.CosaBuildArch)
13781380
} else if isreg && c.Name() == "kola.json" {
13791381
f, err := os.Open(fpath)
13801382
if err != nil {

0 commit comments

Comments
 (0)