From: James Simmons Date: Wed, 14 Feb 2024 12:38:25 +0000 (-0500) Subject: LU-14291 tests: make module loading of ost optional X-Git-Tag: 2.15.5-RC2~2 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=75ed57064c87280f2596261a59f5412095c70161;p=fs%2Flustre-release.git LU-14291 tests: make module loading of ost optional Future Lustre versions will no longer have an ost kernel module. load_module in the test framework will failure so capture the failure to ignore it. We will need this for interop testing. Lustre-change: https://review.whamcloud.com/54040 Lustre-commit: ef7deb7b076e554279f88f6d57afa17884027f9a Change-Id: Iedff4f6a36ceffa9428e3f891db78b7538217085 Test-Parameters: trivial Signed-off-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Timothy Day Reviewed-by: Oleg Drokin Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54258 Tested-by: jenkins Tested-by: Maloo --- diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index d01bfdd..91b1cf9 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -799,9 +799,9 @@ load_modules_local() { load_module mgs/mgs load_module mdd/mdd load_module mdt/mdt - load_module ost/ost + # don't fail if ost module doesn't exist + load_module ost/ost 2>/dev/null || true; load_module lod/lod - load_module osp/osp load_module ofd/ofd load_module osp/osp fi