From 8352378ed874f69eb5362ab6e725af942573fb1f Mon Sep 17 00:00:00 2001 From: Zdenek Veleba Date: Fri, 5 Jun 2026 15:16:55 +0200 Subject: [PATCH 1/2] Change description_format in base reportsender, remove Beaker We now have more than beaker workflow, so the description in base reportsender should be more generic. --- libpermian/reportsenders/base.py | 4 ++-- .../test_xunit/test_0_result/xunit-xunit testplan 1.xml | 8 ++++---- ...it grouped testplan-variant:test;initial_delay:0.2.xml | 2 +- ...it grouped testplan-variant:test;initial_delay:0.5.xml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libpermian/reportsenders/base.py b/libpermian/reportsenders/base.py index b9ed8db..347b324 100644 --- a/libpermian/reportsenders/base.py +++ b/libpermian/reportsenders/base.py @@ -34,7 +34,7 @@ class BaseReportSender(threading.Thread, metaclass=abc.ABCMeta): :param settings: Pipeline settings object :type settings: libpermian.settings.Settings """ - description_format = "Configuration: %s - Result: %s, %s - Beaker links: %s - Issues: %s ; " + description_format = "Configuration: %s - Result: %s, %s - Artifacts links: %s - Issues: %s ; " issue_format = "%s" def __init__(self, testplan, reporting_structure, caseRunConfigurations, event, settings, issueAnalyzerProxy, group=None): super().__init__() @@ -244,7 +244,7 @@ def descriptionOf(self, caseRunConfigurations): ', '.join([ link for link - in crc.result.extra_fields.get('beaker_links', ['None']) + in crc.result.extra_fields.get('artifacts_links', ['None']) ]), '\n'.join([ self.issue_format % issue diff --git a/tests/integration/test_xunit/test_0_result/xunit-xunit testplan 1.xml b/tests/integration/test_xunit/test_0_result/xunit-xunit testplan 1.xml index 47650c7..bab8b4e 100644 --- a/tests/integration/test_xunit/test_0_result/xunit-xunit testplan 1.xml +++ b/tests/integration/test_xunit/test_0_result/xunit-xunit testplan 1.xml @@ -7,17 +7,17 @@ - Configuration: {'conf': 1} - Result: DNF, None - Beaker links: None - Issues: ; Configuration: {'conf': 2} - Result: DNF, None - Beaker links: None - Issues: ; + Configuration: {'conf': 1} - Result: DNF, None - Artifacts links: None - Issues: ; Configuration: {'conf': 2} - Result: DNF, None - Artifacts links: None - Issues: ; - + - Configuration: {'conf': 1, 'initial_delay': 0.1} - Result: complete, FAIL - Beaker links: None - Issues: ; Configuration: {'conf': 2, 'initial_delay': 0.1} - Result: complete, FAIL - Beaker links: None - Issues: ; + Configuration: {'conf': 1, 'initial_delay': 0.1} - Result: complete, FAIL - Artifacts links: None - Issues: ; Configuration: {'conf': 2, 'initial_delay': 0.1} - Result: complete, FAIL - Artifacts links: None - Issues: ; - + \ No newline at end of file diff --git a/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.2.xml b/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.2.xml index 1b7f7af..34beb0a 100644 --- a/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.2.xml +++ b/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.2.xml @@ -7,7 +7,7 @@ - Configuration: {'conf': 1, 'initial_delay': 0.2, 'variant': 'test'} - Result: complete, PASS - Beaker links: None - Issues: ; Configuration: {'conf': 2, 'initial_delay': 0.2, 'variant': 'test'} - Result: complete, PASS - Beaker links: None - Issues: ; + Configuration: {'conf': 1, 'initial_delay': 0.2, 'variant': 'test'} - Result: complete, PASS - Artifacts links: None - Issues: ; Configuration: {'conf': 2, 'initial_delay': 0.2, 'variant': 'test'} - Result: complete, PASS - Artifacts links: None - Issues: ; diff --git a/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.5.xml b/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.5.xml index 12b6d84..5c48aff 100644 --- a/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.5.xml +++ b/tests/integration/test_xunit/test_1_result/xunit-xunit grouped testplan-variant:test;initial_delay:0.5.xml @@ -7,9 +7,9 @@ - Configuration: {'conf': 1, 'initial_delay': 0.5, 'variant': 'test'} - Result: complete, FAIL - Beaker links: None - Issues: ; Configuration: {'conf': 2, 'initial_delay': 0.5, 'variant': 'test'} - Result: complete, FAIL - Beaker links: None - Issues: ; + Configuration: {'conf': 1, 'initial_delay': 0.5, 'variant': 'test'} - Result: complete, FAIL - Artifacts links: None - Issues: ; Configuration: {'conf': 2, 'initial_delay': 0.5, 'variant': 'test'} - Result: complete, FAIL - Artifacts links: None - Issues: ; - + \ No newline at end of file From 76d820be134da9c6e2ef5b8675630d864d8f04e5 Mon Sep 17 00:00:00 2001 From: Zdenek Veleba Date: Fri, 5 Jun 2026 15:19:29 +0200 Subject: [PATCH 2/2] Set artifacts_links in final results in testing farm workflow --- libpermian/plugins/testing_farm/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpermian/plugins/testing_farm/__init__.py b/libpermian/plugins/testing_farm/__init__.py index 1eac6af..623430d 100644 --- a/libpermian/plugins/testing_farm/__init__.py +++ b/libpermian/plugins/testing_farm/__init__.py @@ -159,7 +159,7 @@ def execute(self): if status['result']['overall'] in result2result_map: self.reportResult(Result('complete', result2result_map[status['result']['overall']], - final=True)) + final=True, artifacts_links=[self.weblink] if self.weblink else [])) break else: self.reportResult(Result('complete', 'ERROR', final=True)) @@ -168,7 +168,7 @@ def execute(self): elif state in ['error', 'canceled']: self.reportResult(Result(state2state_map[state], state2result_map[state], - final=True)) + final=True, artifacts_links=[self.weblink] if self.weblink else [])) break elif state in state2state_map and self.crc.result.state != state2state_map[state]: