From cc3d6f0ee0e06cee23447dd3292a93536d54e15d Mon Sep 17 00:00:00 2001 From: John Wren Kennedy Date: Wed, 1 Dec 2021 13:55:55 -0700 Subject: [PATCH] Strip colons from all test result filenames The upload artifact functionality in github can't handle colons in filenames. The current code handles this for files under the most recent set of results. With the ability to rerun failed tests, now there can be multiple sets of results, and they all need to be processed in the same way. Signed-off-by: John Kennedy --- .github/workflows/zfs-tests-functional.yml | 2 +- .github/workflows/zfs-tests-sanity.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml index 46d7deaceb8c..2987cdac6d64 100644 --- a/.github/workflows/zfs-tests-functional.yml +++ b/.github/workflows/zfs-tests-functional.yml @@ -73,7 +73,7 @@ jobs: sudo cp /var/log/syslog $RESULTS_PATH/ sudo chmod +r $RESULTS_PATH/* # Replace ':' in dir names, actions/upload-artifact doesn't support it - for f in $(find $RESULTS_PATH -name '*:*'); do mv "$f" "${f//:/__}"; done + for f in $(find /var/tmp/test_results -name '*:*'); do mv "$f" "${f//:/__}"; done - uses: actions/upload-artifact@v2 if: failure() with: diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml index 9e0317c9dad0..8cba6d78dde2 100644 --- a/.github/workflows/zfs-tests-sanity.yml +++ b/.github/workflows/zfs-tests-sanity.yml @@ -69,7 +69,7 @@ jobs: sudo cp /var/log/syslog $RESULTS_PATH/ sudo chmod +r $RESULTS_PATH/* # Replace ':' in dir names, actions/upload-artifact doesn't support it - for f in $(find $RESULTS_PATH -name '*:*'); do mv "$f" "${f//:/__}"; done + for f in $(find /var/tmp/test_results -name '*:*'); do mv "$f" "${f//:/__}"; done - uses: actions/upload-artifact@v2 if: failure() with: