From: Jian Yu Date: Tue, 20 Dec 2022 04:50:59 +0000 (-0800) Subject: LU-16348 tests: export TESTLOG_PREFIX and TESTNAME to rpc.sh X-Git-Tag: 2.15.54~150 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a6419e0edf9ed270067b2f27886c8469a09f71b7;p=fs%2Flustre-release.git LU-16348 tests: export TESTLOG_PREFIX and TESTNAME to rpc.sh In Lustre test suites, while running do_rpc_nodes, if the remote function failed and error() was called, then gather_logs() can not gather logs with a correct prefix name because TESTLOG_PREFIX and TESTNAME variables were not exported to rpc.sh. Test-Parameters: trivial testlist=sanity,conf-sanity Signed-off-by: Jian Yu Change-Id: I2bdbca7f1886f376160a87293ef367f3a4a59f86 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49260 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 2b8aba5..b3a9dc3 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -8013,7 +8013,9 @@ do_rpc_nodes () { local LIBPATH="/usr/lib/lustre/tests:/usr/lib64/lustre/tests:" local TESTPATH="$RLUSTRE/tests:" local RPATH="PATH=${TESTPATH}${LIBPATH}${PATH}:/sbin:/bin:/usr/sbin:" - do_nodes ${quiet:-"--verbose"} $list "${RPATH} NAME=${NAME} bash rpc.sh $* " + do_nodes ${quiet:-"--verbose"} $list "${RPATH} NAME=${NAME} \ + TESTLOG_PREFIX=$TESTLOG_PREFIX TESTNAME=$TESTNAME \ + bash rpc.sh $* " } wait_clients_import_state () {