Prepare and finish steps save results of their phases

teemtee · Aug 6, 2024 · d362ba0 · d362ba0
1 parent d315345
commit d362ba0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/tmt/steps/__init__.py b/tmt/steps/__init__.py
@@ -2206,7 +2206,8 @@ def run(self, logger: tmt.log.Logger) -> None:
 
 
 @dataclasses.dataclass
-class PluginTask(tmt.queue.MultiGuestTask[None], Generic[StepDataT, PluginReturnValueT]):
+class PluginTask(tmt.queue.MultiGuestTask[PluginReturnValueT],
+                 Generic[StepDataT, PluginReturnValueT]):
     """ A task to run a phase on a given set of guests """
 
     phase: Plugin[StepDataT, PluginReturnValueT]

diff --git a/tmt/steps/finish/__init__.py b/tmt/steps/finish/__init__.py
@@ -152,7 +152,7 @@ def go(self, force: bool = False) -> None:
 
             guest_copies.append(guest_copy)
 
-        queue: PhaseQueue[FinishStepData, None] = PhaseQueue(
+        queue: PhaseQueue[FinishStepData, list[PhaseResult]] = PhaseQueue(
             'finish',
             self._logger.descend(logger_name=f'{self}.queue'))
 
@@ -166,7 +166,8 @@ def go(self, force: bool = False) -> None:
                     guests=[guest for guest in guest_copies if phase.enabled_on_guest(guest)]
                     )
 
-        failed_tasks: list[Union[ActionTask, PluginTask[FinishStepData, None]]] = []
+        failed_tasks: list[Union[ActionTask, PluginTask[FinishStepData, list[PhaseResult]]]] = []
+        results: list[PhaseResult] = []
 
         for outcome in queue.run():
             if not isinstance(outcome.phase, FinishPlugin):
@@ -178,6 +179,11 @@ def go(self, force: bool = False) -> None:
                 failed_tasks.append(outcome)
                 continue
 
+            if outcome.result:
+                results += outcome.result
+
+        self._save_results(results)
+
         if failed_tasks:
             raise tmt.utils.GeneralError(
                 'finish step failed',

diff --git a/tmt/steps/prepare/__init__.py b/tmt/steps/prepare/__init__.py
@@ -347,7 +347,7 @@ def as_key(self) -> frozenset['tmt.base.DependencySimple']:
             # To separate "push" from "prepare" queue visually
             self.info('')
 
-        queue: PhaseQueue[PrepareStepData, None] = PhaseQueue(
+        queue: PhaseQueue[PrepareStepData, list[PhaseResult]] = PhaseQueue(
             'prepare',
             self._logger.descend(logger_name=f'{self}.queue'))
 
@@ -361,7 +361,8 @@ def as_key(self) -> frozenset['tmt.base.DependencySimple']:
                     guests=[
                         guest for guest in guest_copies if prepare_phase.enabled_on_guest(guest)])
 
-        failed_tasks: list[Union[ActionTask, PluginTask[PrepareStepData, None]]] = []
+        failed_tasks: list[Union[ActionTask, PluginTask[PrepareStepData, list[PhaseResult]]]] = []
+        results: list[PhaseResult] = []
 
         for outcome in queue.run():
             if not isinstance(outcome.phase, PreparePlugin):
@@ -373,8 +374,13 @@ def as_key(self) -> frozenset['tmt.base.DependencySimple']:
                 failed_tasks.append(outcome)
                 continue
 
+            if outcome.result:
+                results += outcome.result
+
             self.preparations_applied += 1
 
+        self._save_results(results)
+
         if failed_tasks:
             # TODO: needs a better message...
             raise tmt.utils.GeneralError(