From ddc026f59ba38ae6a33fa7b6874eaa8105ad7df3 Mon Sep 17 00:00:00 2001 From: John Wren Kennedy Date: Wed, 1 Dec 2021 17:18:45 -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. Reviewed-by: Brian Behlendorf Reviewed-by: Tony Nguyen Signed-off-by: John Kennedy Closes #12815 --- .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 46d7deaceb..2987cdac6d 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 9e0317c9da..8cba6d78dd 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: