Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deduplicates discover information #3311

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions tmt/steps/discover/fmf.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class DiscoverFmf(tmt.steps.discover.DiscoverPlugin[DiscoverFmfStepData]):
If no ``ref`` is provided, the default branch from the origin is used.

For DistGit repo one can extract sources first and discover
tests from it by using ``distgit-source: true`` later in Prepare step.
tests from it by using ``dist-git-source: true`` later in ``prepare`` step.
It can be used together with ``ref``, ``path`` and ``url``,
however ``ref`` is not possible without using ``url``.

Expand All @@ -225,17 +225,6 @@ class DiscoverFmf(tmt.steps.discover.DiscoverPlugin[DiscoverFmfStepData]):
how: fmf
dist-git-source: true

Related config options (all optional):

* ``dist-git-merge`` - set to ``true`` if you want to copy in extracted
sources to the local repo
* ``dist-git-init`` - set to ``true`` and ``fmf init`` will be called inside
extracted sources (at ``dist-git-extract`` or top directory)
* ``dist-git-extract`` - directory (glob supported) to copy from
extracted sources (defaults to inner fmf root)
* ``dist-git-remove-fmf-root`` - set to ``true`` to remove fmf root from
extracted sources

Selecting tests containing specified link is possible using ``link``
key accepting ``RELATION:TARGET`` format of values. Regular
expressions are supported for both relation and target part of the
Expand Down
6 changes: 4 additions & 2 deletions tmt/steps/discover/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,10 @@ class DiscoverShell(tmt.steps.discover.DiscoverPlugin[DiscoverShellData]):
Use provided list of shell script tests.

List of test cases to be executed can be defined manually directly
in the plan as a list of dictionaries containing test name, actual
test script and optionally a path to the test. Example config:
in the plan as a list of dictionaries containing ``test name``, actual
``test script`` and optionally the ``duration`` or a ``path`` to the test.
The default duration for tests defined directly in the discover step is ``1h``.
Example config:

.. code-block:: yaml

Expand Down
Loading