diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-02-05 12:50:22 -0500 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-03-17 16:39:39 +0100 |
| commit | af3499db5a91aa6c09a3ba892a8921a5ece6e5ed (patch) | |
| tree | cd33e031d2fa383df003e09d7f42a2f0670d1929 | |
| parent | 3d7a8cf2af43a2d315fff7b8f74ae3d039f68dd0 (diff) | |
| download | podman-af3499db5a91aa6c09a3ba892a8921a5ece6e5ed.tar.gz podman-af3499db5a91aa6c09a3ba892a8921a5ece6e5ed.tar.bz2 podman-af3499db5a91aa6c09a3ba892a8921a5ece6e5ed.zip | |
Latest crun/runc should handle blkio-weight test
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 4e7893e3b..9c13f5303 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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}" diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 490d05699..0ec4edbab 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -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"}) |