Latest crun/runc should handle blkio-weight test

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2021-02-05 12:50:22 -05:00 committed by Giuseppe Scrivano
parent 3d7a8cf2af
commit af3499db5a
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
2 changed files with 1 additions and 4 deletions

View File

@ -30,7 +30,7 @@ env:
PRIOR_UBUNTU_NAME: "ubuntu-2004"
# Google-cloud VM Images
IMAGE_SUFFIX: "c6524344056676352"
IMAGE_SUFFIX: "c5961289315909632"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"

View File

@ -583,9 +583,6 @@ USER bin`
Skip("Kernel does not support blkio.weight")
}
}
if podmanTest.Host.Distribution == "ubuntu" {
Skip("Ubuntu <= 20.10 lacks BFQ scheduler")
}
if CGROUPSV2 {
// convert linearly from [10-1000] to [1-10000]
session := podmanTest.Podman([]string{"run", "--rm", "--blkio-weight=15", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.bfq.weight"})