robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support multiple sources in one variant

Browse source 
With this patch the gather_source option is no longer used. Instead, all
sources are always used. If they return at least some input packages,
then a configured method is used and the returned lists of packages from
all sources are merged.

The method used for gathering can be configured for each variant and
gather source separately.

Additional packages are only added to the comps source.

Each gathering step is logged separately. All the logs are preserved for
later inspection.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-11-07 14:16:37 +01:00
parent 0074fe3f2c
commit 364d7f5229
12 changed files with 199 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

36
doc/configuration.rst
View file

@ -35,7 +35,6 @@ Minimal Config Example
createrepo_checksum = "sha256"
# GATHER
gather_source = "comps"
gather_method = "deps"
greedy_method = "build"
check_deps = False
@ -546,16 +545,13 @@ Gather Settings
Options
-------
**gather_source** [mandatory]
(*str*) -- from where to read initial package list; expected values:
``comps``, ``none``, ``module``
When ``comps`` is selected, you have to specify ``comps_file`` option. When
``module`` is selected, you have to :ref:`configure PDC API url <pdc-settings>`.
**gather_method** [mandatory]
(*str*) -- Options are ``deps`` and ``nodeps``. Specifies whether package
dependencies should be pulled in as well.
(*str*|*dict*) -- Options are ``deps`` and ``nodeps``. Specifies whether
package dependencies should be pulled in as well. Either a single value or
a dictionary mapping variant UID and source type to a value. Make sure only
one regex matches each variant, as there is no guarantee which value will
be used if there are multiple matching ones. All used sources must have a
configured method.
**gather_fulltree** = False
(*bool*) -- When set to ``True`` all RPMs built from an SRPM will always be
@ -671,9 +667,9 @@ Options
such cases are still reported as warnings in the log.
**gather_source_mapping**
(*str*) -- Only use when ``gather_source = "json"``. The value should be a
path to JSON file with following mapping: ``{variant: {arch: {rpm_name:
[rpm_arch|None]}}}``.
(*str*) -- JSON mapping with initial packages for the compose. The value
should be a path to JSON file with following mapping: ``{variant: {arch:
{rpm_name: [rpm_arch|None]}}}``.
**gather_profiler** = False
(*bool*) -- When set to ``True`` the gather tool will produce additional
@ -685,12 +681,24 @@ Example
-------
::
gather_source = "comps"
gather_method = "deps"
greedy_method = "build"
check_deps = False
hashed_directories = True
gather_method = {
"^Everything$": {
"comps": "deps" # traditional content defined by comps groups
},
"^Modular$": {
"module": "nodeps" # Modules do not need dependencies
},
"^Mixed$": { # Mixed content in one variant
"comps": "deps",
"module": "nodeps"
}
}
additional_packages = [
# bz#123456
('^(Workstation|Server)$', {

6
doc/gathering.rst
View file

@ -8,9 +8,9 @@ a subset of the content targeted at a particular use case.
There are different types of variants. The type affects how packages are
gathered into the variant.
The inputs for gathering are defined by the ``gather_source`` option. It
provides a list of package names, comps groups names and a list of packages
that should be filtered out.
The inputs for gathering are defined by various gather sources. Packages from
all sources are collected to create a big list of package names, comps groups
names and a list of packages that should be filtered out.
.. note::
The inputs for both explicit package list and comps file are interpreted as