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

[live-images] No manifest for appliances

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-02-26 19:46:59 +01:00
parent e6596d818c
commit 73a560d63c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pungi/phases/live_images.py
View File

@ -272,7 +272,10 @@ class CreateLiveImageThread(WorkerThread):
for rpm_path in rpm_paths: for rpm_path in rpm_paths:
shutil.copy2(rpm_path, cmd["dest_dir"]) shutil.copy2(rpm_path, cmd["dest_dir"])
if cmd['type'] == 'live':
# ISO manifest only makes sense for live images
self._write_manifest(destination) self._write_manifest(destination)
self._add_to_images(compose, variant, arch, cmd['type'], self._get_format(image_path), destination) self._add_to_images(compose, variant, arch, cmd['type'], self._get_format(image_path), destination)
self.pool.log_info("[DONE ] %s" % msg) self.pool.log_info("[DONE ] %s" % msg)

6
tests/test_liveimagesphase.py
View File

@ -469,11 +469,7 @@ class TestCreateLiveImageThread(PungiTestCase):
self.assertEqual(copy2.mock_calls, self.assertEqual(copy2.mock_calls,
[mock.call('/path/to/image-a.b-sda.raw.xz', self.topdir + '/compose/Client/amd64/iso/image-name')]) [mock.call('/path/to/image-a.b-sda.raw.xz', self.topdir + '/compose/Client/amd64/iso/image-name')])
write_manifest_cmd = ' && '.join([ self.assertEqual(run.mock_calls, [])
'cd ' + self.topdir + '/compose/Client/amd64/iso',
'isoinfo -R -f -i image-name | grep -v \'/TRANS.TBL$\' | sort >> image-name.manifest'
])
self.assertEqual(run.mock_calls, [mock.call(write_manifest_cmd)])
self.assertEqual(koji_wrapper.get_create_image_cmd.mock_calls, self.assertEqual(koji_wrapper.get_create_image_cmd.mock_calls,
[mock.call('Test', '20151203.0.t', 'rhel-7.0-candidate', [mock.call('Test', '20151203.0.t', 'rhel-7.0-candidate',
'amd64', '/path/to/ks_file', 'amd64', '/path/to/ks_file',