Skip to content
This repository has been archived by the owner on May 7, 2021. It is now read-only.

kola/podman: Bump memory tests to 128m for runc #1085

Merged
merged 1 commit into from
Oct 10, 2019
Merged

kola/podman: Bump memory tests to 128m for runc #1085

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
6 changes: 4 additions & 2 deletions kola/tests/podman/podman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,9 @@ func podmanResources(c cluster.TestCluster) {

for _, podmanCmd := range []string{
// must set memory when setting memory-swap
pCmd("--memory=10m --memory-swap=10m"),
// See https://github.com/opencontainers/runc/issues/1980 for
// why we use 128m for memory
pCmd("--memory=128m --memory-swap=128m"),
pCmd("--memory-reservation=10m"),
pCmd("--kernel-memory=10m"),
pCmd("--cpu-shares=100"),
Expand All @@ -267,7 +269,7 @@ func podmanResources(c cluster.TestCluster) {
pCmd("--cpuset-mems=0"),
pCmd("--cpu-quota=1000"),
pCmd("--blkio-weight=10"),
pCmd("--memory=10m --oom-kill-disable=true"),
pCmd("--memory=128m --oom-kill-disable=true"),
pCmd("--memory-swappiness=50"),
pCmd("--shm-size=1m"),
} {
Expand Down