Skip to content

Stop bumping aarch64 to 8G automatically #3617

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

Merged
dustymabe merged 1 commit into from
Sep 15, 2023
Merged

Stop bumping aarch64 to 8G automatically #3617

Show file tree
Hide file tree
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: 2 additions & 2 deletions mantle/kola/harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,10 +1204,10 @@ ExecStart=%s
config.AddSystemdUnit(unitName, unit, conf.NoState)

// Architectures using 64k pages use slightly more memory, ask for more than requested
// to make sure that we don't run out of it. Currently ppc64le and aarch64 use 64k pages.
// to make sure that we don't run out of it. Currently, only ppc64le uses 64k pages by default.
// See similar logic in boot-mirror.go and luks.go.
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
if targetMeta.MinMemory <= 4096 {
targetMeta.MinMemory = targetMeta.MinMemory * 2
}
Expand Down
4 changes: 2 additions & 2 deletions mantle/kola/tests/ignition/luks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ func runTest(c cluster.TestCluster, tpm2 bool, threshold int, killTangAfterFirst
opts := platform.MachineOptions{
MinMemory: 4096,
}
// ppc64le and aarch64 use 64K pages; see similar logic in harness.go and boot-mirror.go
// ppc64le uses 64K pages; see similar logic in harness.go and boot-mirror.go
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
opts.MinMemory = 8192
}
m, err := c.NewMachineWithOptions(ignition, opts)
Expand Down
8 changes: 4 additions & 4 deletions mantle/kola/tests/misc/boot-mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ func runBootMirrorTest(c cluster.TestCluster) {
MinMemory: 4096,
},
}
// ppc64le and aarch64 use 64K pages; see similar logic in harness.go and luks.go
// ppc64le uses 64K pages; see similar logic in harness.go and luks.go
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
options.MinMemory = 8192
}
// FIXME: for QEMU tests kola currently assumes the host CPU architecture
Expand Down Expand Up @@ -152,9 +152,9 @@ func runBootMirrorLUKSTest(c cluster.TestCluster) {
MinMemory: 4096,
},
}
// ppc64le and aarch64 use 64K pages; see similar logic in harness.go and luks.go
// ppc64le uses 64K pages; see similar logic in harness.go and luks.go
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
options.MinMemory = 8192
}
// FIXME: for QEMU tests kola currently assumes the host CPU architecture
Expand Down