almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
pull from: a8_updated
merge into: almalinux:a8
Conversation 0 Commits 158 Files Changed 128 +20 -13
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5831d4ae1e - Show all commits

25
pungi/phases/gather/__init__.py
View File

@ -36,8 +36,7 @@ from pungi.compose import get_ordered_variant_uids
from pungi.module_util import Modulemd, collect_module_defaults from pungi.module_util import Modulemd, collect_module_defaults
from pungi.phases.base import PhaseBase from pungi.phases.base import PhaseBase
from pungi.phases.createrepo import add_modular_metadata from pungi.phases.createrepo import add_modular_metadata
from pungi.util import (get_arch_data, get_arch_variant_data, get_variant_data, from pungi.util import get_arch_data, get_arch_variant_data, get_variant_data, makedirs
makedirs)
from pungi.wrappers.scm import get_file_from_scm from pungi.wrappers.scm import get_file_from_scm
from ...wrappers.createrepo import CreaterepoWrapper from ...wrappers.createrepo import CreaterepoWrapper
@ -97,11 +96,18 @@ class GatherPhase(PhaseBase):
# check whether variants from configuration value # check whether variants from configuration value
# 'variant_as_lookaside' have same architectures # 'variant_as_lookaside' have same architectures
for (requiring, required) in variant_as_lookaside: for (requiring, required) in variant_as_lookaside:
if requiring in all_variants and required in all_variants and \ if (
sorted(all_variants[requiring].arches) \ requiring in all_variants
!= sorted(all_variants[required].arches): and required in all_variants
errors.append("variant_as_lookaside: variant \'%s\' doesn't have same " and not set(all_variants[requiring].arches).issubset(
"architectures as \'%s\'" % (requiring, required)) set(all_variants[required].arches)
)
):
errors.append(
"variant_as_lookaside: architectures of variant '%s' "
"aren't subset of architectures of variant '%s'"
% (requiring, required)
)
if errors: if errors:
raise ValueError("\n".join(errors)) raise ValueError("\n".join(errors))
@ -664,8 +670,9 @@ def _make_lookaside_repo(compose, variant, arch, pkg_map, package_sets=None):
pkg = pkg[len(path_prefix) :] pkg = pkg[len(path_prefix) :]
package_list.add(pkg) package_list.add(pkg)
except KeyError: except KeyError:
raise RuntimeError("Variant \'%s\' does not have architecture " raise RuntimeError(
"\'%s\'!" % (variant, pkg_arch)) "Variant '%s' does not have architecture " "'%s'!" % (variant, pkg_arch)
)
pkglist = compose.paths.work.lookaside_package_list(arch=arch, variant=variant) pkglist = compose.paths.work.lookaside_package_list(arch=arch, variant=variant)
with open(pkglist, "w") as f: with open(pkglist, "w") as f:

8
tests/test_gather_phase.py
View File

@ -1582,7 +1582,7 @@ class TestGatherPhase(helpers.PungiTestCase):
phase = gather.GatherPhase(compose, pkgset_phase) phase = gather.GatherPhase(compose, pkgset_phase)
phase.validate() phase.validate()
def test_validates_variants_architecture_mismatch(self): def test_validates_variants_requiring_is_not_subset_of_required(self):
pkgset_phase = mock.Mock() pkgset_phase = mock.Mock()
compose = helpers.DummyCompose( compose = helpers.DummyCompose(
self.topdir, {"variant_as_lookaside": [("Everything", "Client")]} self.topdir, {"variant_as_lookaside": [("Everything", "Client")]}
@ -1590,12 +1590,12 @@ class TestGatherPhase(helpers.PungiTestCase):
phase = gather.GatherPhase(compose, pkgset_phase) phase = gather.GatherPhase(compose, pkgset_phase)
with self.assertRaises(ValueError) as ctx: with self.assertRaises(ValueError) as ctx:
phase.validate() phase.validate()
self.assertIn("'Everything' doesn't have", str(ctx.exception)) self.assertIn("architectures of variant 'Client'", str(ctx.exception))
def test_validates_variants_architecture_match(self): def test_validates_variants_requiring_is_subset_of_required(self):
pkgset_phase = mock.Mock() pkgset_phase = mock.Mock()
compose = helpers.DummyCompose( compose = helpers.DummyCompose(
self.topdir, {"variant_as_lookaside": [("Everything", "Everything")]} self.topdir, {"variant_as_lookaside": [("Client", "Everything")]}
) )
phase = gather.GatherPhase(compose, pkgset_phase) phase = gather.GatherPhase(compose, pkgset_phase)
phase.validate() phase.validate()