From 992b4babf01231e00fda71901de26aa22ed15b38 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 8 Oct 2024 16:07:02 +0200 Subject: [PATCH 1/2] Remove data-path field from tmt-report-result output (tmt-report-results.yaml) --- tests/execute/result/special.sh | 1 - tmt/steps/execute/scripts/tmt-report-result | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/execute/result/special.sh b/tests/execute/result/special.sh index d42cc423ca..2566710da4 100755 --- a/tests/execute/result/special.sh +++ b/tests/execute/result/special.sh @@ -16,7 +16,6 @@ rlJournalStart rlAssertGrep 'name: "/0\.\.7 \\"special\\": \\" characters: \*\$@|&>< in: the: name"' "$RESULT_FILE" rlAssertGrep "result: \"pass\"" "$RESULT_FILE" rlAssertGrep "end-time: \".*\"" "$RESULT_FILE" - rlAssertGrep "data-path: \"/.*\"" "$RESULT_FILE" rlPhaseEnd rlPhaseStartCleanup diff --git a/tmt/steps/execute/scripts/tmt-report-result b/tmt/steps/execute/scripts/tmt-report-result index 4d0c199a27..3e5353cc8d 100755 --- a/tmt/steps/execute/scripts/tmt-report-result +++ b/tmt/steps/execute/scripts/tmt-report-result @@ -20,7 +20,6 @@ write_report_file () { echo " - \"${outputFile}\"" >> "$REPORT_RESULT_OUTPUTFILE" fi echo " end-time: \"$(date --utc +%FT%T.%6N%:z)\"" >> "$REPORT_RESULT_OUTPUTFILE" - echo " data-path: \"${TMT_TEST_DATA/$TMT_TEST_EXE}\"" >> "$REPORT_RESULT_OUTPUTFILE" } copy_outputfile_to_data_dir () { From 9cf3ac3e65e84a94e23a838eaedd8ce89a5773d2 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Tue, 8 Oct 2024 16:16:57 +0200 Subject: [PATCH 2/2] Fix the shellcheck problems --- tmt/steps/execute/scripts/tmt-report-result | 1 - 1 file changed, 1 deletion(-) diff --git a/tmt/steps/execute/scripts/tmt-report-result b/tmt/steps/execute/scripts/tmt-report-result index 3e5353cc8d..2f9194e6f4 100755 --- a/tmt/steps/execute/scripts/tmt-report-result +++ b/tmt/steps/execute/scripts/tmt-report-result @@ -2,7 +2,6 @@ set -o errexit -o pipefail -o noclobber -o nounset REPORT_RESULT_OUTPUTFILE="$TMT_TEST_DATA/tmt-report-results.yaml" -TMT_TEST_EXE="${TMT_TREE/tree/execute}" outputFile= help=False