From 4a96e8e3130e04477117fbaa6014a4d05caed1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 7 Dec 2015 08:43:00 +0100 Subject: [PATCH] Run lorax in separate dirs for each variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lorax fails when run on an existing non-empty directory. This patch runs it in separate subdirectiories base on variant. Running with buildinstall should not be changed at all. Signed-off-by: Lubomír Sedlář --- pungi/phases/buildinstall.py | 10 +++- tests/test_buildinstall.py | 103 +++++++++++++++++++++++++++++++---- 2 files changed, 102 insertions(+), 11 deletions(-) diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py index 1bd8f030..f97f4167 100644 --- a/pungi/phases/buildinstall.py +++ b/pungi/phases/buildinstall.py @@ -101,7 +101,7 @@ class BuildinstallPhase(PhaseBase): version, release, repo_baseurl, - output_dir, + os.path.join(output_dir, variant.uid), variant=variant.uid, buildinstallpackages=variant.buildinstallpackages, is_final=self.compose.supported, @@ -128,11 +128,19 @@ class BuildinstallPhase(PhaseBase): self.pool.start() def copy_files(self): + buildinstall_method = self.compose.conf["buildinstall_method"] + # copy buildinstall files to the 'os' dir kickstart_file = get_kickstart_file(self.compose) for arch in self.compose.get_arches(): for variant in self.compose.get_variants(arch=arch, types=["self", "variant"]): buildinstall_dir = self.compose.paths.work.buildinstall_dir(arch) + + # Lorax runs per-variant, so we need to tweak the source path + # to include variant. + if buildinstall_method == 'lorax': + buildinstall_dir = os.path.join(buildinstall_dir, variant.uid) + if not os.path.isdir(buildinstall_dir) or not os.listdir(buildinstall_dir): continue diff --git a/tests/test_buildinstall.py b/tests/test_buildinstall.py index b5e8f9e5..ad15189c 100755 --- a/tests/test_buildinstall.py +++ b/tests/test_buildinstall.py @@ -18,7 +18,8 @@ class _DummyCompose(object): self.conf = config self.paths = mock.Mock( compose=mock.Mock( - topdir=mock.Mock(return_value='/a/b') + topdir=mock.Mock(return_value='/a/b'), + os_tree=mock.Mock(side_effect=lambda arch, variant: os.path.join('/ostree', arch, variant.uid)) ), work=mock.Mock( arch_repo=mock.Mock(return_value='file:///a/b/'), @@ -28,17 +29,17 @@ class _DummyCompose(object): self._logger = mock.Mock() self.log_debug = mock.Mock() self.supported = True + self.variants = { + 'x86_64': [mock.Mock(uid='Server', buildinstallpackages=['bash', 'vim'])], + 'amd64': [mock.Mock(uid='Client', buildinstallpackages=[]), + mock.Mock(uid='Server', buildinstallpackages=['bash', 'vim'])], + } def get_arches(self): return ['x86_64', 'amd64'] def get_variants(self, arch, types): - variants = { - 'x86_64': [mock.Mock(uid='Server', buildinstallpackages=['bash', 'vim'])], - 'amd64': [mock.Mock(uid='Client', buildinstallpackages=[]), - mock.Mock(uid='Server', buildinstallpackages=['bash', 'vim'])], - } - return variants.get(arch, []) + return self.variants.get(arch, []) class TestImageChecksumPhase(unittest.TestCase): @@ -88,13 +89,13 @@ class TestImageChecksumPhase(unittest.TestCase): # Obtained correct lorax commands. lorax = loraxCls.return_value lorax.get_lorax_cmd.assert_has_calls( - [mock.call('Test', '1', '1', 'file:///a/b/', '/buildinstall_dir/x86_64', + [mock.call('Test', '1', '1', 'file:///a/b/', '/buildinstall_dir/x86_64/Server', buildarch='x86_64', is_final=True, nomacboot=True, noupgrade=True, volid='vol_id', variant='Server', buildinstallpackages=['bash', 'vim']), - mock.call('Test', '1', '1', 'file:///a/b/', '/buildinstall_dir/amd64', + mock.call('Test', '1', '1', 'file:///a/b/', '/buildinstall_dir/amd64/Server', buildarch='amd64', is_final=True, nomacboot=True, noupgrade=True, volid='vol_id', variant='Server', buildinstallpackages=['bash', 'vim']), - mock.call('Test', '1', '1', 'file:///a/b/', '/buildinstall_dir/amd64', + mock.call('Test', '1', '1', 'file:///a/b/', '/buildinstall_dir/amd64/Client', buildarch='amd64', is_final=True, nomacboot=True, noupgrade=True, volid='vol_id', variant='Client', buildinstallpackages=[])], any_order=True) @@ -132,5 +133,87 @@ class TestImageChecksumPhase(unittest.TestCase): any_order=True) +class TestCopyFiles(unittest.TestCase): + + @mock.patch('pungi.phases.buildinstall.symlink_boot_iso') + @mock.patch('pungi.phases.buildinstall.tweak_buildinstall') + @mock.patch('pungi.phases.buildinstall.get_volid') + @mock.patch('os.listdir') + @mock.patch('os.path.isdir') + @mock.patch('pungi.phases.buildinstall.get_kickstart_file') + def test_copy_files_buildinstall(self, get_kickstart_file, isdir, listdir, + get_volid, tweak_buildinstall, symlink_boot_iso): + compose = _DummyCompose({ + 'buildinstall_method': 'buildinstall' + }) + + get_volid.side_effect = lambda compose, arch, variant, escape_spaces: "%s.%s" % (variant.uid, arch) + get_kickstart_file.return_value = 'kickstart' + + phase = BuildinstallPhase(compose) + phase.copy_files() + + get_volid.assert_has_calls( + [mock.call(compose, 'x86_64', compose.variants['x86_64'][0], escape_spaces=False), + mock.call(compose, 'amd64', compose.variants['amd64'][0], escape_spaces=False), + mock.call(compose, 'amd64', compose.variants['amd64'][1], escape_spaces=False)], + any_order=True + ) + tweak_buildinstall.assert_has_calls( + [mock.call('/buildinstall_dir/x86_64', '/ostree/x86_64/Server', 'x86_64', 'Server', '', + 'Server.x86_64', 'kickstart'), + mock.call('/buildinstall_dir/amd64', '/ostree/amd64/Server', 'amd64', 'Server', '', + 'Server.amd64', 'kickstart'), + mock.call('/buildinstall_dir/amd64', '/ostree/amd64/Client', 'amd64', 'Client', '', + 'Client.amd64', 'kickstart')], + any_order=True + ) + symlink_boot_iso.assert_has_calls( + [mock.call(compose, 'x86_64', compose.variants['x86_64'][0]), + mock.call(compose, 'amd64', compose.variants['amd64'][0]), + mock.call(compose, 'amd64', compose.variants['amd64'][1])], + any_order=True + ) + + @mock.patch('pungi.phases.buildinstall.symlink_boot_iso') + @mock.patch('pungi.phases.buildinstall.tweak_buildinstall') + @mock.patch('pungi.phases.buildinstall.get_volid') + @mock.patch('os.listdir') + @mock.patch('os.path.isdir') + @mock.patch('pungi.phases.buildinstall.get_kickstart_file') + def test_copy_files_lorax(self, get_kickstart_file, isdir, listdir, + get_volid, tweak_buildinstall, symlink_boot_iso): + compose = _DummyCompose({ + 'buildinstall_method': 'lorax' + }) + + get_volid.side_effect = lambda compose, arch, variant, escape_spaces: "%s.%s" % (variant.uid, arch) + get_kickstart_file.return_value = 'kickstart' + + phase = BuildinstallPhase(compose) + phase.copy_files() + + get_volid.assert_has_calls( + [mock.call(compose, 'x86_64', compose.variants['x86_64'][0], escape_spaces=False), + mock.call(compose, 'amd64', compose.variants['amd64'][0], escape_spaces=False), + mock.call(compose, 'amd64', compose.variants['amd64'][1], escape_spaces=False)], + any_order=True + ) + tweak_buildinstall.assert_has_calls( + [mock.call('/buildinstall_dir/x86_64/Server', '/ostree/x86_64/Server', 'x86_64', 'Server', '', + 'Server.x86_64', 'kickstart'), + mock.call('/buildinstall_dir/amd64/Server', '/ostree/amd64/Server', 'amd64', 'Server', '', + 'Server.amd64', 'kickstart'), + mock.call('/buildinstall_dir/amd64/Client', '/ostree/amd64/Client', 'amd64', 'Client', '', + 'Client.amd64', 'kickstart')], + any_order=True + ) + symlink_boot_iso.assert_has_calls( + [mock.call(compose, 'x86_64', compose.variants['x86_64'][0]), + mock.call(compose, 'amd64', compose.variants['amd64'][0]), + mock.call(compose, 'amd64', compose.variants['amd64'][1])], + any_order=True + ) + if __name__ == "__main__": unittest.main()