From 25e25da424f419e52699c56618b369142f390d6a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Mar 2019 11:56:46 -0700 Subject: [PATCH] tests: Skip Moby kernel config checks on 5.x See https://github.com/moby/moby/issues/38887 for details. Basically 5.x removed support for CFQ with f382fb0bcef4 ("block: remove legacy IO schedulers") and the Moby check still requires it. Signed-off-by: Rolf Neugebauer --- test/pkg/kernel-config/check.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/pkg/kernel-config/check.sh b/test/pkg/kernel-config/check.sh index d46760603..cd3adc3db 100755 --- a/test/pkg/kernel-config/check.sh +++ b/test/pkg/kernel-config/check.sh @@ -6,6 +6,13 @@ function failed { } /check-kernel-config.sh || failed -bash /check-config.sh || failed + +# Skip moby kernel checks on 5.x kernels for now. +# See: https://github.com/moby/moby/issues/38887 +kernelVersion="$(uname -r)" +kernelMajor="${kernelVersion%%.*}" +if [ "$kernelMajor" -lt 5 ]; then + bash /check-config.sh || failed +fi printf "Kernel config test suite PASSED\n"