From 3211709032751c160578af58db0f72c98be45727 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 14 Feb 2024 07:38:25 -0500 Subject: [PATCH] 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 Test-Parameters: trivial Signed-off-by: James Simmons Change-Id: Iedff4f6a36ceffa9428e3f891db78b7538217085 Reviewed-by: Andreas Dilger Reviewed-by: Timothy Day Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54799 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu --- lustre/tests/test-framework.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 6a31b6e..4cc3b3c 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -803,9 +803,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 -- 1.8.3.1