From cda15fd4f61d38210ba534fab5f8e8230160d9e3 Mon Sep 17 00:00:00 2001
From: Chris Horn <chris.horn@hpe.com>
Date: Fri, 22 Oct 2021 01:34:23 +0000
Subject: [PATCH] LU-15150 tests: sanity-lnet removes testsuite log on failure

cleanup_testsuite() needs to be more selective when removing files
created by sub-tests.

Lustre-change: https://review.whamcloud.com/45342
Lustre-commit: 29918b2db487e7ec8b0bdf785b0a436332824db6

Test-Parameters: trivial testlist=sanity-lnet
Fixes: aa739144551 ("LU-13569 tests: Check LNet Health recovery logic")
Signed-off-by: Chris Horn <chris.horn@hpe.com>
Change-Id: Ic17a68ff2aa552594a0f1ea470c39177abe985fc
Reviewed-by: Serguei Smirnov <ssmirnov@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/45743
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---
 lustre/tests/sanity-lnet.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lustre/tests/sanity-lnet.sh b/lustre/tests/sanity-lnet.sh
index aa80f3a..d2d57e7 100755
--- a/lustre/tests/sanity-lnet.sh
+++ b/lustre/tests/sanity-lnet.sh
@@ -55,7 +55,8 @@ fi
 
 cleanup_testsuite() {
 	trap "" EXIT
-	rm -f $TMP/sanity-dlc*
+	# Cleanup any tmp files created by the sub tests
+	rm -f $TMP/sanity-lnet-*.yaml $LNET_PARAMS_FILE
 	cleanup_netns
 	cleanup_lnet
 	if $restore_mounts; then
-- 
1.8.3.1