From 9303cf9e416ac9622b64d7de4838138d8ec39971 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 9 Aug 2022 08:53:26 -0500 Subject: [PATCH 1/4] Add check of successful clone to rt.sh Fixes #680. --- reg_tests/rt.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/reg_tests/rt.sh b/reg_tests/rt.sh index 4c5b103b7..ae808548d 100755 --- a/reg_tests/rt.sh +++ b/reg_tests/rt.sh @@ -17,6 +17,18 @@ rm -f reg_test_results.txt rm -rf UFS_UTILS git clone --recursive https://github.com/ufs-community/UFS_UTILS.git +rc=$? + +# Check to see if the clone was successful. Previously, it has +# failed due to lack of disk space. + +if [[ $rc == 0 ]] && [[ -d UFS_UTILS ]];then + echo "Clone Successful" +else + target=`hostname -s` + echo "Clone Failed" | mail -s "UFS_UTILS Consistency Tests failed on ${target}" ${MAILTO} +fi + cd UFS_UTILS source sorc/machine-setup.sh From 29f77e64c0759101f4f4b048e5a19af8ed46eb05 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 9 Aug 2022 14:34:54 +0000 Subject: [PATCH 2/4] Add better logic to determine hostname. Fixes #680. --- reg_tests/rt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reg_tests/rt.sh b/reg_tests/rt.sh index ae808548d..9af76e9f6 100755 --- a/reg_tests/rt.sh +++ b/reg_tests/rt.sh @@ -26,6 +26,9 @@ if [[ $rc == 0 ]] && [[ -d UFS_UTILS ]];then echo "Clone Successful" else target=`hostname -s` + if [[ -d /lfs3 ]] ; then + target=Jet + fi echo "Clone Failed" | mail -s "UFS_UTILS Consistency Tests failed on ${target}" ${MAILTO} fi From bbbe8d6222c686681f0366edf4cb22bafb46fb32 Mon Sep 17 00:00:00 2001 From: "George.Gayno" Date: Tue, 9 Aug 2022 14:49:30 +0000 Subject: [PATCH 3/4] Add better logic for wcoss2. Fixes #680. --- reg_tests/rt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reg_tests/rt.sh b/reg_tests/rt.sh index 9af76e9f6..f79a15164 100755 --- a/reg_tests/rt.sh +++ b/reg_tests/rt.sh @@ -28,6 +28,8 @@ else target=`hostname -s` if [[ -d /lfs3 ]] ; then target=Jet + elif [[ -d /lfs/h1 ]] ; then + target=WCOSS2 fi echo "Clone Failed" | mail -s "UFS_UTILS Consistency Tests failed on ${target}" ${MAILTO} fi From 41dca59e59f4a7e95bce6ced6e18407d68187e27 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 9 Aug 2022 15:02:56 +0000 Subject: [PATCH 4/4] Add hostname logic for hera. Fixes #680. --- reg_tests/rt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reg_tests/rt.sh b/reg_tests/rt.sh index f79a15164..e2d975a75 100755 --- a/reg_tests/rt.sh +++ b/reg_tests/rt.sh @@ -30,6 +30,8 @@ else target=Jet elif [[ -d /lfs/h1 ]] ; then target=WCOSS2 + elif [[ -d /scratch1 ]] ; then + target=Hera fi echo "Clone Failed" | mail -s "UFS_UTILS Consistency Tests failed on ${target}" ${MAILTO} fi