From 6eade22711ef729ddcd580d0e1a30116affbb2fe Mon Sep 17 00:00:00 2001 From: Karel Srot Date: Wed, 12 Jun 2024 20:42:37 +0200 Subject: [PATCH] Copy launch description to suite description (#2992) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Petr Šplíchal --- docs/releases.rst | 4 ++++ tmt/steps/report/reportportal.py | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/releases.rst b/docs/releases.rst index b27d7a05cf..bf8c7ae15b 100644 --- a/docs/releases.rst +++ b/docs/releases.rst @@ -12,6 +12,10 @@ The :ref:`/spec/tests/duration` now supports multiplication. Added option ``--failed-only`` to the test attributes, enabling rerunning failed tests from previous runs. +The :ref:`plugins/report/reportportal` plugin copies +launch description also into the suite description when the +``--suite-per-plan`` option is used. + The :ref:`virtual` provision plugin gains support for adding multiple disks to guests, by adding the corresponding ``disk[N].size`` diff --git a/tmt/steps/report/reportportal.py b/tmt/steps/report/reportportal.py index 6bf830b1f0..c2154a85c6 100644 --- a/tmt/steps/report/reportportal.py +++ b/tmt/steps/report/reportportal.py @@ -380,19 +380,17 @@ def go(self) -> None: launch_attributes = self.construct_launch_attributes(suite_per_plan, attributes) if suite_per_plan: - launch_description = self.data.launch_description - suite_description = self.step.plan.summary or "" - if (self.data.upload_to_launch and suite_per_plan): - suite_description = self.append_description(suite_description) + launch_description = self.data.launch_description or "" + suite_description = self.append_description(self.step.plan.summary or "") else: launch_description = self.step.plan.summary or "" launch_description = self.append_description(launch_description) + suite_description = "" # Check whether artifacts URL has been provided - if not launch_description: - launch_description = self.data.artifacts_url - elif self.data.artifacts_url: - launch_description = f"{launch_description}, {self.data.artifacts_url}" + if self.data.artifacts_url: + launch_description += f"
{self.data.artifacts_url}" + suite_description += f"
{self.data.artifacts_url}" # Communication with RP instance with tmt.utils.retry_session() as session: