From 3fb549b4cf7fc59fb5774e7675a1ec57e5cc4fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 6 May 2026 12:22:08 +0200 Subject: [PATCH] Revert "butane: replace `LAYOUT` with architecture before render" This reverts commit 7338b388c426ad79d9ddfcd319c3fb039b0217a4. --- mantle/kola/harness.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mantle/kola/harness.go b/mantle/kola/harness.go index 3c1aeb3581..2b2263a708 100644 --- a/mantle/kola/harness.go +++ b/mantle/kola/harness.go @@ -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 {