From 9135049760b437c630fb1c217b1577f6c79795e3 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 20 Sep 2021 15:00:46 -0600 Subject: [PATCH] EX-3720 tests: skip lpcc_purge tests if not installed Skip lpcc_purge tests if package is not installed on client. Test-Parameters: trivial testlist=sanity-pcc env=ONLY=200-202 clientextra_install_params="--packages lipe-lpcc" Test-Parameters: testlist=sanity-pcc env=ONLY=200-202 Signed-off-by: Andreas Dilger Change-Id: Ic977c1cad602cc1ae33b273493bfb9d0f9dbe37b Reviewed-on: https://review.whamcloud.com/44994 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Nunez --- lustre/tests/sanity-pcc.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanity-pcc.sh b/lustre/tests/sanity-pcc.sh index d0ba99b..5051164 100644 --- a/lustre/tests/sanity-pcc.sh +++ b/lustre/tests/sanity-pcc.sh @@ -4016,6 +4016,9 @@ test_200() { $LCTL get_param -n mdc.*.connect_flags | grep -q pcc_ro || skip "Server does not support PCC-RO" + LPCC_PURGE=${LPCC_PURGE:-$(do_facet $SINGLEAGT "which lpcc_purge")} + [[ -n "$LPCC_PURGE" ]] || skip_env "lpcc_purge not found on $SINGLEAGT" + setup_loopdev $SINGLEAGT $loopfile $mntpt 14 do_facet $SINGLEAGT mkdir $hsm_root || error "mkdir $hsm_root failed" setup_pcc_mapping $SINGLEAGT \ @@ -4049,7 +4052,7 @@ test_200() { fi pidfile=lpcc_purge-${HSM_ARCHIVE_NUMBER}.pid - do_facet $SINGLEAGT /usr/bin/lpcc_purge --mount $MOUNT --cache $hsm_root \ + do_facet $SINGLEAGT $LPCC_PURGE --mount $MOUNT --cache $hsm_root \ --high-usage $high_usage --low-usage $low_usage \ --roid $HSM_ARCHIVE_NUMBER --pidfile $pidfile --interval 1 -b & sleep 5 @@ -4084,6 +4087,9 @@ test_201() { $LCTL get_param -n mdc.*.connect_flags | grep -q pcc_ro || skip "Server does not support PCC-RO" + LPCC_PURGE=${LPCC_PURGE:-$(do_facet $SINGLEAGT "which lpcc_purge")} + [[ -n "$LPCC_PURGE" ]] || skip_env "lpcc_purge not found on $SINGLEAGT" + setup_loopdev $SINGLEAGT $loopfile $mntpt 14 do_facet $SINGLEAGT mkdir $hsm_root || error "mkdir $hsm_root failed" setup_pcc_mapping $SINGLEAGT \ @@ -4117,7 +4123,7 @@ test_201() { fi pidfile=lpcc_purge-${HSM_ARCHIVE_NUMBER}.pid - do_facet $SINGLEAGT /usr/bin/lpcc_purge --mount $MOUNT --cache $hsm_root \ + do_facet $SINGLEAGT $LPCC_PURGE --mount $MOUNT --cache $hsm_root \ --high-usage $high_usage --low-usage $low_usage \ --roid $HSM_ARCHIVE_NUMBER --pidfile $pidfile --interval 1 -b & sleep 5 @@ -4153,6 +4159,9 @@ test_202() { $LCTL get_param -n mdc.*.connect_flags | grep -q pcc_ro || skip "Server does not support PCC-RO" + LPCC_PURGE=${LPCC_PURGE:-$(do_facet $SINGLEAGT "which lpcc_purge")} + [[ -n "$LPCC_PURGE" ]] || skip_env "lpcc_purge not found on $SINGLEAGT" + setup_loopdev $SINGLEAGT $loopfile $mntpt 14 do_facet $SINGLEAGT mkdir $hsm_root || error "mkdir $hsm_root failed" setup_pcc_mapping $SINGLEAGT \ @@ -4179,7 +4188,7 @@ test_202() { done pidfile=lpcc_purge-${HSM_ARCHIVE_NUMBER}.pid - do_facet $SINGLEAGT /usr/bin/lpcc_purge --mount $MOUNT --cache $hsm_root \ + do_facet $SINGLEAGT $LPCC_PURGE --mount $MOUNT --cache $hsm_root \ --high-usage $high_usage --low-usage $low_usage \ --roid $HSM_ARCHIVE_NUMBER --pidfile $pidfile --interval 1 -b & sleep 5 -- 1.8.3.1