diff --git a/doc/configuration.rst b/doc/configuration.rst index b7f8f863..cfb29385 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -246,6 +246,7 @@ There a couple common format specifiers available for both the options: * ``boot`` -- for ``boot.iso`` images created in *buildinstall* phase * ``live`` -- for images created by *live_images* phase * ``dvd`` -- for images created by *createiso* phase + * ``ostree`` -- for ostree installer images Default values are the same as the keys. diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py index 5b45f75a..dc730f2d 100644 --- a/pungi/phases/ostree_installer.py +++ b/pungi/phases/ostree_installer.py @@ -53,7 +53,7 @@ class OstreeInstallerThread(WorkerThread): self._run_ostree_cmd(compose, variant, arch, config, source_repo, output_dir) - disc_type = compose.conf['disc_types'].get('dvd', 'dvd') + disc_type = compose.conf['disc_types'].get('ostree', 'ostree') filename = compose.get_image_name(arch, variant, disc_type=disc_type) self._copy_image(compose, variant, arch, filename, output_dir) self._add_to_manifest(compose, variant, arch, filename) diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py index 06339df5..bcedc2dc 100644 --- a/tests/test_ostree_installer_phase.py +++ b/tests/test_ostree_installer_phase.py @@ -118,7 +118,7 @@ class OstreeThreadTest(helpers.PungiTestCase): self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertEqual(compose.get_image_name.call_args_list, - [mock.call('x86_64', compose.variants['Everything'], disc_type='dvd')]) + [mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/')) self.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer')) self.assertEqual(run.call_args_list, @@ -182,7 +182,7 @@ class OstreeThreadTest(helpers.PungiTestCase): self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertEqual(compose.get_image_name.call_args_list, - [mock.call('x86_64', compose.variants['Everything'], disc_type='dvd')]) + [mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/')) self.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer')) self.assertEqual(run.call_args_list, @@ -297,7 +297,7 @@ class OstreeThreadTest(helpers.PungiTestCase): self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertEqual(compose.get_image_name.call_args_list, - [mock.call('x86_64', compose.variants['Everything'], disc_type='dvd')]) + [mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/')) self.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer')) self.assertEqual(run.call_args_list, @@ -381,7 +381,7 @@ class OstreeThreadTest(helpers.PungiTestCase): self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertEqual(compose.get_image_name.call_args_list, - [mock.call('x86_64', compose.variants['Everything'], disc_type='dvd')]) + [mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) @mock.patch('kobo.shortcuts.run') @mock.patch('productmd.images.Image')