Skip to content

Commit 0fde650

Browse files
committed
qemu: use 2048 MiB on all architectures
The alternatives test is now failing because rpm-ostree gets OOM killed because we're now including the coreos-pool repo when layering iptables-legacy [1]. Let's just move x86_64 to the default of 2048 that we're using everywhere else too. [1] coreos/fedora-coreos-config#4038
1 parent c6612bc commit 0fde650

1 file changed

Lines changed: 1 addition & 18 deletions

File tree

mantle/platform/qemu.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,24 +1366,7 @@ func (builder *QemuBuilder) finalize() {
13661366
return
13671367
}
13681368
if builder.MemoryMiB == 0 {
1369-
// FIXME; Required memory should really be a property of the tests, and
1370-
// let's try to drop these arch-specific overrides. ARM was bumped via
1371-
// commit 09391907c0b25726374004669fa6c2b161e3892f
1372-
// Commit: Geoff Levand <geoff@infradead.org>
1373-
// CommitDate: Mon Aug 21 12:39:34 2017 -0700
1374-
//
1375-
// kola: More memory for arm64 qemu guest machines
1376-
//
1377-
// arm64 guest machines seem to run out of memory with 1024 MiB of
1378-
// RAM, so increase to 2048 MiB.
1379-
1380-
// Then later, other non-x86_64 seemed to just copy that.
1381-
memory := 1024
1382-
switch builder.architecture {
1383-
case "aarch64", "s390x", "ppc64le":
1384-
memory = 2048
1385-
}
1386-
builder.MemoryMiB = memory
1369+
builder.MemoryMiB = 2048
13871370
}
13881371
builder.finalized = true
13891372
}

0 commit comments

Comments
 (0)