Skip to content

Commit 9e20505

Browse files
committed
Disable blkio test for older kernels
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
1 parent 10ee222 commit 9e20505

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

cmd/nerdctl/container/container_run_cgroup_linux_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,11 @@ func TestRunBlkioSettingCgroupV2(t *testing.T) {
484484
testCase := nerdtest.Setup()
485485
testCase.Require = nerdtest.Rootful
486486

487+
// See https://github.com/containerd/nerdctl/issues/4185
488+
// It is unclear if this is truly a kernel version problem, a runc issue, or a distro (EL9) issue.
489+
// For now, disable the test unless on a recent kernel.
490+
testutil.RequireKernelVersion(t, ">= 6.0.0-0")
491+
487492
// Create dummy device path
488493
dummyDev := "/dev/dummy-zero"
489494

pkg/testutil/testutil.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,9 @@ func RequireKernelVersion(t testing.TB, constraint string) {
610610
if err != nil {
611611
t.Fatal(err)
612612
}
613-
unameR, err := semver.NewVersion(infoutil.UnameR())
613+
// EL kernel versions are not semver, so, cleanup first
614+
un := strings.Split(infoutil.UnameR(), "-")[0]
615+
unameR, err := semver.NewVersion(un)
614616
if err != nil {
615617
t.Skip(err)
616618
}

0 commit comments

Comments
 (0)