Skip to content

Commit bd2eebf

Browse files
authored
Add log path for journal.xml to results.yaml (teemtee#3779)
Fixes teemtee#3748.
1 parent 59d70aa commit bd2eebf

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

docs/releases.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Initial implementation for the test-level policies has been added as
2323
well, aiming at CI workflows that need to enforce AVC checks across the
2424
whole component portfolio.
2525

26+
The ``results.yaml`` file will now contain the log path for
27+
``journal.xml``.
28+
2629

2730
tmt-1.49.0
2831
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

tests/execute/basic/test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ rlJournalStart
6868
0 "Check output.txt log exists in $results"
6969
rlRun "yq -ery '.[] | select(.name == \"/test/beakerlib/good\") | .log | map({path: .}) | .[] | select(.path | test(\"^data/.+/journal.txt$\"))' $results" \
7070
0 "Check journal.txt log exists in $results"
71+
rlRun "yq -ery '.[] | select(.name == \"/test/beakerlib/good\") | .log | map({path: .}) | .[] | select(.path | test(\"^data/.+/journal.xml$\"))' $results" \
72+
0 "Check journal.xml log exists in $results"
7173
rlPhaseEnd
7274

7375
rlPhaseStartCleanup

tmt/frameworks/beakerlib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def extract_results(
134134
note: list[str] = []
135135
log: list[Path] = [
136136
invocation.relative_path / filename
137-
for filename in [tmt.steps.execute.TEST_OUTPUT_FILENAME, 'journal.txt']
137+
for filename in [tmt.steps.execute.TEST_OUTPUT_FILENAME, 'journal.txt', 'journal.xml']
138138
if (invocation.path / filename).is_file()
139139
]
140140

0 commit comments

Comments
 (0)