From 8fc3b73c40d78e21dd1d2b968e53963da9ba6b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Mon, 13 Jan 2025 15:35:01 +0100 Subject: [PATCH] squash: move --- spec/core/order.fmf | 24 ------------------------ spec/plans/prepare.fmf | 25 +++++++++++++++++++------ 2 files changed, 19 insertions(+), 30 deletions(-) diff --git a/spec/core/order.fmf b/spec/core/order.fmf index aa3f9060eb..f73658f57e 100644 --- a/spec/core/order.fmf +++ b/spec/core/order.fmf @@ -1,6 +1,3 @@ -/: - select: true - summary: Order in which the object should be handled description: @@ -17,24 +14,3 @@ example: | link: - implemented-by: /tmt/base.py - verified-by: /tests/core/order - -/predefined-order: - title: Predefined order values - - description: | - 30 - Installation of essential plugin and check requirements. - - 50 - The default order of any object. - - 60 - Application of patches by ``rpm-build`` command invoked by - :ref:`discover/fmf` plugin when - ``dist-git-source`` key is used. - - 70 - Installation of packages :ref:`required` by tests. - - 75 - Installation of packages :ref:`recommended` by tests. diff --git a/spec/plans/prepare.fmf b/spec/plans/prepare.fmf index 1a9633d2fd..69b5d10bb0 100644 --- a/spec/plans/prepare.fmf +++ b/spec/plans/prepare.fmf @@ -14,12 +14,25 @@ description: | Use the ``order`` attribute to select in which order the preparation should happen if there are multiple configs. - Default order is ``50``. For installation of essential plugin - and check requirements ``30`` is used, for installation of - required packages gathered from the :ref:`/spec/tests/require` - attribute of individual tests order ``70`` is used, for recommended - packages it is ``75``. The Dist-git prepare happens before those, - with order ``60``. + The following are predefined ``order`` values of various + preparations: + + 30 + Installation of essential plugin and check requirements. + + 50 + The default order of any object. + + 60 + Application of patches by ``rpm-build`` command invoked by + :ref:`discover/fmf` plugin when + ``dist-git-source`` key is used. + + 70 + Installation of packages :ref:`required` by tests. + + 75 + Installation of packages :ref:`recommended` by tests. .. note::