squash: move variables around

teemtee · Jan 10, 2025 · 3ce97f6 · 3ce97f6
1 parent 3e1bbc3
commit 3ce97f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/spec/core/order.fmf b/spec/core/order.fmf
@@ -21,8 +21,6 @@ link:
 /predefined-order:
     title: Predefined order values
 
-    summary: Predefined order values - summary
-
     description: |
         30
             Installation of essential plugin and check requirements.

diff --git a/tmt/steps/__init__.py b/tmt/steps/__init__.py
@@ -82,11 +82,11 @@
 # `PHASE_ORDER_DEFAULT = tmt.base.DEFAULT_ORDER` would be way better.
 PHASE_ORDER_DEFAULT = 50
 #: Installation of essential plugin and check requirements.
-PHASE_ORDER_INSTALL_ESSENTIAL_REQUIRES = 30
+PHASE_ORDER_PREPARE_INSTALL_ESSENTIAL_REQUIRES = 30
 #: Installation of packages :ref:`required</spec/tests/require>` by tests.
-PHASE_ORDER_INSTALL_REQUIRES = 70
+PHASE_ORDER_PREPARE_INSTALL_REQUIRES = 70
 #: Installation of packages :ref:`recommended</spec/tests/recommend>` by tests.
-PHASE_ORDER_INSTALL_RECOMMENDS = 75
+PHASE_ORDER_PREPARE_INSTALL_RECOMMENDS = 75
 
 # Supported steps and actions
 STEPS: list[str] = ['discover', 'provision', 'prepare', 'execute', 'report', 'finish']

diff --git a/tmt/steps/prepare/__init__.py b/tmt/steps/prepare/__init__.py
@@ -343,19 +343,19 @@ def _emit_phase(
             pruned_essential_requires,
             'essential-requires',
             'Install essential required packages',
-            tmt.steps.PHASE_ORDER_INSTALL_ESSENTIAL_REQUIRES)
+            tmt.steps.PHASE_ORDER_PREPARE_INSTALL_ESSENTIAL_REQUIRES)
 
         _emit_phase(
             pruned_requires,
             'requires',
             'Install required packages',
-            tmt.steps.PHASE_ORDER_INSTALL_REQUIRES)
+            tmt.steps.PHASE_ORDER_PREPARE_INSTALL_REQUIRES)
 
         _emit_phase(
             pruned_recommends,
             'recommends',
             'Install recommended packages',
-            tmt.steps.PHASE_ORDER_INSTALL_RECOMMENDS,
+            tmt.steps.PHASE_ORDER_PREPARE_INSTALL_RECOMMENDS,
             missing='skip')
 
         # Prepare guests (including workdir sync)

diff --git a/tmt/steps/prepare/distgit.py b/tmt/steps/prepare/distgit.py
@@ -64,7 +64,7 @@ def insert_to_prepare_step(
         how='install',
         name='requires (dist-git)',
         summary='Install required packages of tests detected by dist-git',
-        order=tmt.steps.PHASE_ORDER_INSTALL_REQUIRES,
+        order=tmt.steps.PHASE_ORDER_PREPARE_INSTALL_REQUIRES,
         where=where,
         package=[])
     future_requires: PreparePlugin[Any] = cast(
@@ -77,7 +77,7 @@ def insert_to_prepare_step(
         how='install',
         name='recommends (dist-git)',
         summary='Install recommended packages of tests detected by dist-git',
-        order=tmt.steps.PHASE_ORDER_INSTALL_RECOMMENDS,
+        order=tmt.steps.PHASE_ORDER_PREPARE_INSTALL_RECOMMENDS,
         where=where,
         package=[],
         missing='skip')