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

Merge #539 comps: Filter comps groups for optional variants

Browse Source
This commit is contained in:
Dennis Gilmore 2017-02-23 20:13:39 +00:00
commit 8b1fb287d3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pungi/phases/init.py
View File

@ -46,8 +46,11 @@ class InitPhase(PhaseBase):
# write variant comps # write variant comps
for variant in self.compose.get_variants(): for variant in self.compose.get_variants():
for arch in variant.arches: for arch in variant.arches:
if variant.groups: if variant.groups or variant.type == 'optional':
# The variant lists only some groups, run filter. # The variant lists only some groups, run filter. Other
# option is that it's optional variant, in which case
# we want to filter everything (unless there was
# explicit list in which case it will be used).
write_variant_comps(self.compose, arch, variant) write_variant_comps(self.compose, arch, variant)
else: else:
# The variant does not mention any groups, copy # The variant does not mention any groups, copy
@ -127,6 +130,8 @@ def write_variant_comps(compose, arch, variant):
def copy_variant_comps(compose, arch, variant): def copy_variant_comps(compose, arch, variant):
global_comps = compose.paths.work.comps(arch="global") global_comps = compose.paths.work.comps(arch="global")
comps_file = compose.paths.work.comps(arch=arch, variant=variant) comps_file = compose.paths.work.comps(arch=arch, variant=variant)
msg = "Copying original comps file (arch: %s, variant: %s): %s" % (arch, variant, comps_file)
compose.log_debug(msg)
shutil.copy(global_comps, comps_file) shutil.copy(global_comps, comps_file)

4
tests/test_initphase.py
View File

@ -24,6 +24,7 @@ class TestInitPhase(PungiTestCase):
def test_run(self, write_prepopulate, write_variant, create_comps, write_arch, write_global): def test_run(self, write_prepopulate, write_variant, create_comps, write_arch, write_global):
compose = DummyCompose(self.topdir, {}) compose = DummyCompose(self.topdir, {})
compose.has_comps = True compose.has_comps = True
compose.setup_optional()
phase = init.InitPhase(compose) phase = init.InitPhase(compose)
phase.run() phase.run()
@ -38,7 +39,8 @@ class TestInitPhase(PungiTestCase):
mock.call(compose, 'amd64', compose.variants['Server']), mock.call(compose, 'amd64', compose.variants['Server']),
mock.call(compose, 'amd64', compose.variants['Client']), mock.call(compose, 'amd64', compose.variants['Client']),
mock.call(compose, 'x86_64', compose.variants['Everything']), mock.call(compose, 'x86_64', compose.variants['Everything']),
mock.call(compose, 'amd64', compose.variants['Everything'])]) mock.call(compose, 'amd64', compose.variants['Everything']),
mock.call(compose, 'x86_64', compose.all_variants['Server-optional'])])
@mock.patch('pungi.phases.init.copy_variant_comps') @mock.patch('pungi.phases.init.copy_variant_comps')
@mock.patch('pungi.phases.init.write_global_comps') @mock.patch('pungi.phases.init.write_global_comps')