Add support for full recipe loading

Author: therazix

tests/recipe/data/import.yaml

@@ -100,7 +100,6 @@ plans:
             restart-max-count: 1
             restart-with-reboot: false
             serial-number: 1
-            discover-phase: default-0
             link: []
             test: echo one
             path: /default-0/tests/tests
@@ -134,7 +133,6 @@ plans:
             restart-max-count: 1
             restart-with-reboot: false
             serial-number: 2
-            discover-phase: default-0
             link: []
             test: echo two
             path: /default-0/tests/tests

tests/recipe/data/insert.yaml

@@ -141,7 +141,6 @@ plans:
             restart-max-count: 1
             restart-with-reboot: false
             serial-number: 1
-            discover-phase: discover-shell
             link: []
             test: /bin/true
             path: /discover-shell/tests
@@ -174,7 +173,6 @@ plans:
             restart-max-count: 1
             restart-with-reboot: false
             serial-number: 2
-            discover-phase: default-0
             link: []
             test: ./test.sh
             path: /default-0/tests

tests/recipe/data/remote.yaml

@@ -96,7 +96,6 @@ plans:
             restart-max-count: 1
             restart-with-reboot: false
             serial-number: 1
-            discover-phase: default-0
             link: []
             test: echo one
             path: /default-0/tests/tests

tests/recipe/data/simple.yaml

@@ -141,7 +141,6 @@ plans:
             restart-max-count: 1
             restart-with-reboot: false
             serial-number: 1
-            discover-phase: discover-fmf
             link: []
             test: ./test.sh
             path: /discover-fmf/tests
@@ -178,7 +177,6 @@ plans:
             restart-max-count: 1
             restart-with-reboot: false
             serial-number: 2
-            discover-phase: discover-shell
             link: []
             test: /bin/true
             path: /discover-shell/tests

tests/recipe/load.sh

@@ -8,7 +8,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "Test recipe loading with library dependencies"
-        rlRun -s "tmt run -vvv --scratch --id $run --recipe simple.yaml plan -n /plans/simple"
+        rlRun -s "tmt run -vvv --scratch --id $run --recipe simple.yaml"
         rlAssertGrep "name: discover-fmf" $rlRun_LOG
         rlAssertGrep "name: discover-shell" $rlRun_LOG
         rlAssertGrep "summary: 2 tests selected" $rlRun_LOG
@@ -18,25 +18,17 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "Test recipe loading with remote repository"
-        rlRun -s "tmt run -vvv --scratch --id $run --recipe remote.yaml plan -n /plans/remote"
+        rlRun -s "tmt run -vvv --scratch --id $run --recipe remote.yaml"
         rlAssertGrep "summary: 1 test selected" $rlRun_LOG
         rlAssertGrep "pass /tests/one" $rlRun_LOG
         rlAssertGrep "summary: 1 test executed" $rlRun_LOG
     rlPhaseEnd
 
     rlPhaseStartTest "Test recipe loading of imported plan"
-        rlRun -s "tmt run -vvv --scratch --id $run --recipe import.yaml discover plan -n /plans/import"
+        rlRun -s "tmt run -vvv --scratch --id $run --recipe import.yaml discover"
         rlAssertGrep "summary: 2 tests selected" $rlRun_LOG
     rlPhaseEnd
 
-    rlPhaseStartTest "Test recipe loading with non-existent plan"
-        rlRun "temp=\$(mktemp -d)" 0 "Create temporary directory"
-        rlRun "cp -r .fmf simple.yaml $temp"
-        rlRun "pushd $temp"
-        rlRun -s "tmt run -vvv --scratch --id $run --recipe simple.yaml" 2 "Remote plan is not in the recipe"
-        rlAssertGrep "Plan '/default/plan' not found in the recipe" $rlRun_LOG
-    rlPhaseEnd
-
     rlPhaseStartCleanup
         rlRun "popd"
         rlRun "rm -r $run" 0 "Remove run directory"

tmt/base/core.py

@@ -3033,6 +3033,9 @@ def environment(self) -> Environment:
           options.
         """
 
+        if self.recipe is not None:
+            return self.recipe.run.environment.copy()
+
         return Environment(
             {
                 **self._environment_from_workdir,

tmt/recipe.py

@@ -13,7 +13,7 @@
 
 if TYPE_CHECKING:
     import tmt.base.core
-    from tmt.base.core import Dependency, Run, _RawAdjustRule, _RawLinks
+    from tmt.base.core import Dependency, Run, _RawAdjustRule
     from tmt.base.plan import Plan
 
 
@@ -27,14 +27,6 @@ def _unserialize_dependency(
     return dependency_factory(serialized)
 
 
-# This needs to be a stand-alone function because of the import of `tmt.base`.
-# It cannot be imported on module level because of circular dependency.
-def _unserialize_links(serialized: Optional['_RawLinks']) -> Optional['tmt.base.core.Links']:
-    from tmt.base.core import Links
-
-    return Links(data=serialized)
-
-
 @container
 class _RecipeTest(SerializableContainer):
     name: str
@@ -58,18 +50,16 @@ class _RecipeTest(SerializableContainer):
     restart_max_count: int
     restart_with_reboot: bool
     serial_number: int
-    discover_phase: str
     link: Optional['tmt.base.core.Links'] = field(
         serialize=lambda value: value.to_spec() if value else [],
-        unserialize=lambda value: _unserialize_links(value),
     )
     test: ShellScript = field(
         serialize=lambda value: str(value),
         unserialize=lambda value: ShellScript(value),
     )
-    path: Optional[Path] = field(
-        serialize=lambda value: str(value) if value else None,
-        unserialize=lambda value: Path(value) if value else None,
+    path: Path = field(
+        serialize=lambda value: str(value),
+        unserialize=lambda value: Path(value),
     )
     require: list['Dependency'] = field(
         serialize=lambda value: [dependency.to_minimal_spec() for dependency in value],
@@ -89,9 +79,17 @@ class _RecipeTest(SerializableContainer):
     )
     check: list[Check] = field(
         serialize=lambda checks: [check.to_spec() for check in checks],
-        unserialize=lambda serialized: [Check.from_spec(**check) for check in serialized],
     )
 
+    # ignore[override]: does not match the signature on purpose, we need to pass logger
+    @classmethod
+    def from_serialized(cls, serialized: dict[str, Any], logger: Logger) -> '_RecipeTest':  # type: ignore[override]
+        raw_checks = serialized.pop('check', [])
+        serialized['check'] = []
+        recipe_test = super().from_serialized(serialized)
+        recipe_test.check = [Check.from_spec(check, logger) for check in raw_checks]
+        return recipe_test
+
     @classmethod
     def from_test_origin(cls, test_origin: 'TestOrigin') -> '_RecipeTest':
         return _RecipeTest(
@@ -109,7 +107,7 @@ def from_test_origin(cls, test_origin: 'TestOrigin') -> '_RecipeTest':
             link=test_origin.test.link,
             component=test_origin.test.component,
             test=test_origin.test.test or ShellScript(''),
-            path=test_origin.test.path,
+            path=test_origin.test.path or Path('/'),
             framework=test_origin.test.framework,
             manual=test_origin.test.manual,
             tty=test_origin.test.tty,
@@ -124,7 +122,6 @@ def from_test_origin(cls, test_origin: 'TestOrigin') -> '_RecipeTest':
             restart_max_count=test_origin.test.restart_max_count,
             restart_with_reboot=test_origin.test.restart_with_reboot,
             serial_number=test_origin.test.serial_number,
-            discover_phase=test_origin.phase,
         )
 
     def to_minimal_spec(self) -> dict[str, Any]:
@@ -134,7 +131,6 @@ def to_minimal_spec(self) -> dict[str, Any]:
             if value not in (None, [], {})
         }
         data.pop('__class__')
-        data.pop('discover-phase')
         return data
 
     def to_test(self, logger: Logger) -> 'tmt.base.core.Test':
@@ -202,7 +198,9 @@ def from_serialized(cls, serialized: dict[str, Any], logger: Logger) -> '_Recipe
             phases=[StepData.unserialize(phase, logger) for phase in serialized.get('phases', [])]
             if enabled
             else [],
-            tests=[_RecipeTest.from_serialized(test) for test in serialized.get('tests', [])],
+            tests=[
+                _RecipeTest.from_serialized(test, logger) for test in serialized.get('tests', [])
+            ],
         )
 
     @classmethod
@@ -305,7 +303,7 @@ def from_serialized(cls, serialized: dict[str, Any], logger: Logger) -> '_Recipe
             tag=serialized.get('tag', []),
             tier=serialized.get('tier'),
             adjust=serialized.get('adjust'),
-            link=_unserialize_links(serialized.get('link')),
+            link=serialized.get('link'),
             environment_from_fmf=Environment.from_fmf_spec(
                 serialized.get('environment-from-fmf', {})
             ),
@@ -358,8 +356,27 @@ def from_plan(cls, plan: 'Plan') -> '_RecipePlan':
         )
 
     def to_spec(self) -> dict[str, Any]:
-        # TODO: For now, only return the discover step.
-        return {'discover': self.discover.to_spec()}
+        spec = self.to_dict()
+
+        for e in [
+            'environment_from_fmf',
+            'environment_from_importing',
+            'environment_from_cli',
+            'environment_from_intrinsics',
+        ]:
+            spec.pop(e)
+
+        spec['environment'] = self.environment_from_fmf.to_fmf_spec()
+        spec['context'] = self.context.to_spec()
+
+        spec['discover'] = self.discover.to_spec()
+        spec['provision'] = self.provision.to_spec()
+        spec['prepare'] = self.prepare.to_spec()
+        spec['execute'] = self.execute.to_spec()
+        spec['report'] = self.report.to_spec()
+        spec['finish'] = self.finish.to_spec()
+        spec['cleanup'] = self.cleanup.to_spec()
+        return spec
 
 
 @container
@@ -425,7 +442,7 @@ def tests(self, recipe: Recipe, plan_name: str) -> list[TestOrigin]:
             if plan.name == plan_name:
                 return [
                     TestOrigin(
-                        phase=test.discover_phase,
+                        phase=test.path.unrooted().parts[0],
                         test=test.to_test(self._logger),
                     )
                     for test in plan.discover.tests
@@ -438,4 +455,5 @@ def update_tree(recipe: Recipe, tree: fmf.Tree) -> None:
         """
         Load the plans from the recipe and update the given fmf tree with their specifications.
         """
+        tree.children.clear()
         tree.update({plan.name: plan.to_spec() for plan in recipe.plans})

tmt/steps/discover/__init__.py

@@ -588,6 +588,14 @@ def discover_from_recipe(self, logger: Optional[tmt.log.Logger] = None) -> None:
             if test_origin.phase == self.name
         ]
 
+        # Recreate test paths if they don't exist
+        for test in self._tests:
+            if test.path is None:
+                continue
+            path = self.test_dir / test.path.unrooted().relative_to(Path(self.safe_name) / 'tests')
+            if not path.exists():
+                path.mkdir(parents=True, exist_ok=True)
+
 
 class Discover(tmt.steps.Step):
     """