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

ostree-installer: Generate correct volume ID

Browse Source 
The volume ID should be generated in Pungi with the same format as for
other images.

Fixes: #419
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-10-06 09:17:09 +02:00
parent cc559b12f4
commit 32059c57c0
2 changed files with 43 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pungi/phases/ostree_installer.py
View File

@ -10,6 +10,7 @@ from kobo import shortcuts
from .base import ConfigGuardedPhase from .base import ConfigGuardedPhase
from .. import util from .. import util
from ..paths import translate_path from ..paths import translate_path
from ..util import get_volid
from ..wrappers import kojiwrapper, iso, lorax, scm from ..wrappers import kojiwrapper, iso, lorax, scm
@ -50,10 +51,11 @@ class OstreeInstallerThread(WorkerThread):
self.template_dir = os.path.join(compose.paths.work.topdir(arch), variant.uid, 'lorax_templates') self.template_dir = os.path.join(compose.paths.work.topdir(arch), variant.uid, 'lorax_templates')
self._clone_templates(config.get('template_repo'), config.get('template_branch')) self._clone_templates(config.get('template_repo'), config.get('template_branch'))
self._run_ostree_cmd(compose, variant, arch, config, source_repo, output_dir)
disc_type = compose.conf['disc_types'].get('ostree', 'ostree') disc_type = compose.conf['disc_types'].get('ostree', 'ostree')
volid = get_volid(compose, arch, variant, disc_type=disc_type)
self._run_ostree_cmd(compose, variant, arch, config, source_repo, output_dir, volid)
filename = compose.get_image_name(arch, variant, disc_type=disc_type) filename = compose.get_image_name(arch, variant, disc_type=disc_type)
self._copy_image(compose, variant, arch, filename, output_dir) self._copy_image(compose, variant, arch, filename, output_dir)
self._add_to_manifest(compose, variant, arch, filename) self._add_to_manifest(compose, variant, arch, filename)
@ -135,7 +137,7 @@ class OstreeInstallerThread(WorkerThread):
templates.append(template) templates.append(template)
return templates return templates
def _run_ostree_cmd(self, compose, variant, arch, config, source_repo, output_dir): def _run_ostree_cmd(self, compose, variant, arch, config, source_repo, output_dir, volid):
lorax_wrapper = lorax.LoraxWrapper() lorax_wrapper = lorax.LoraxWrapper()
cmd = lorax_wrapper.get_lorax_cmd( cmd = lorax_wrapper.get_lorax_cmd(
compose.conf['release_name'], compose.conf['release_name'],
@ -145,6 +147,7 @@ class OstreeInstallerThread(WorkerThread):
output_dir=output_dir, output_dir=output_dir,
variant=variant.uid, variant=variant.uid,
nomacboot=True, nomacboot=True,
volid=volid,
buildinstallpackages=config.get('installpkgs'), buildinstallpackages=config.get('installpkgs'),
add_template=self._get_templates(config, 'add_template'), add_template=self._get_templates(config, 'add_template'),
add_arch_template=self._get_templates(config, 'add_arch_template'), add_arch_template=self._get_templates(config, 'add_arch_template'),

100
tests/test_ostree_installer_phase.py
View File

@ -45,6 +45,16 @@ class OstreeInstallerPhaseTest(helpers.PungiTestCase):
class OstreeThreadTest(helpers.PungiTestCase): class OstreeThreadTest(helpers.PungiTestCase):
def setUp(self):
super(OstreeThreadTest, self).setUp()
self.compose = helpers.DummyCompose(self.topdir, {
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
'image_volid_formats': ['{release_short}-{variant}-{arch}'],
})
def assertImageAdded(self, compose, ImageCls, IsoWrapper): def assertImageAdded(self, compose, ImageCls, IsoWrapper):
image = ImageCls.return_value image = ImageCls.return_value
self.assertEqual(image.path, 'Everything/x86_64/iso/image-name') self.assertEqual(image.path, 'Everything/x86_64/iso/image-name')
@ -69,13 +79,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
@mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper') @mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
def test_run(self, KojiWrapper, link, IsoWrapper, def test_run(self, KojiWrapper, link, IsoWrapper,
get_file_size, get_mtime, ImageCls, run): get_file_size, get_mtime, ImageCls, run):
compose = helpers.DummyCompose(self.topdir, { self.compose.supported = False
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
})
compose.supported = False
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'Everything', 'source_repo_from': 'Everything',
@ -93,7 +97,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t = ostree.OstreeInstallerThread(pool) t = ostree.OstreeInstallerThread(pool)
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
self.assertEqual(koji.get_runroot_cmd.call_args_list, self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64', [mock.call('rrt', 'x86_64',
@ -104,6 +108,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--source=file://%s/compose/Everything/x86_64/os' % self.topdir, '--source=file://%s/compose/Everything/x86_64/os' % self.topdir,
'--variant=Everything', '--variant=Everything',
'--nomacboot', '--nomacboot',
'--volid=test-Everything-x86_64',
self.topdir + '/work/x86_64/Everything/ostree_installer'], self.topdir + '/work/x86_64/Everything/ostree_installer'],
channel=None, mounts=[self.topdir], channel=None, mounts=[self.topdir],
packages=['pungi', 'lorax', 'ostree'], packages=['pungi', 'lorax', 'ostree'],
@ -116,9 +121,9 @@ class OstreeThreadTest(helpers.PungiTestCase):
final_iso_path)]) final_iso_path)])
self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)])
self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)])
self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertImageAdded(self.compose, ImageCls, IsoWrapper)
self.assertEqual(compose.get_image_name.call_args_list, self.assertEqual(self.compose.get_image_name.call_args_list,
[mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) [mock.call('x86_64', self.compose.variants['Everything'], disc_type='ostree')])
self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/')) 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.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer'))
self.assertEqual(run.call_args_list, self.assertEqual(run.call_args_list,
@ -133,12 +138,6 @@ class OstreeThreadTest(helpers.PungiTestCase):
@mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper') @mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
def test_run_external_source(self, KojiWrapper, link, IsoWrapper, def test_run_external_source(self, KojiWrapper, link, IsoWrapper,
get_file_size, get_mtime, ImageCls, run): get_file_size, get_mtime, ImageCls, run):
compose = helpers.DummyCompose(self.topdir, {
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
})
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'http://example.com/repo/$arch/', 'source_repo_from': 'http://example.com/repo/$arch/',
@ -156,7 +155,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t = ostree.OstreeInstallerThread(pool) t = ostree.OstreeInstallerThread(pool)
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
self.assertEqual(koji.get_runroot_cmd.call_args_list, self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64', [mock.call('rrt', 'x86_64',
@ -168,6 +167,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--variant=Everything', '--variant=Everything',
'--nomacboot', '--nomacboot',
'--isfinal', '--isfinal',
'--volid=test-Everything-x86_64',
self.topdir + '/work/x86_64/Everything/ostree_installer'], self.topdir + '/work/x86_64/Everything/ostree_installer'],
channel=None, mounts=[self.topdir], channel=None, mounts=[self.topdir],
packages=['pungi', 'lorax', 'ostree'], packages=['pungi', 'lorax', 'ostree'],
@ -180,9 +180,9 @@ class OstreeThreadTest(helpers.PungiTestCase):
final_iso_path)]) final_iso_path)])
self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)])
self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)])
self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertImageAdded(self.compose, ImageCls, IsoWrapper)
self.assertEqual(compose.get_image_name.call_args_list, self.assertEqual(self.compose.get_image_name.call_args_list,
[mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) [mock.call('x86_64', self.compose.variants['Everything'], disc_type='ostree')])
self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/')) 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.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer'))
self.assertEqual(run.call_args_list, self.assertEqual(run.call_args_list,
@ -198,12 +198,6 @@ class OstreeThreadTest(helpers.PungiTestCase):
def test_fail_with_relative_template_path_but_no_repo(self, KojiWrapper, link, def test_fail_with_relative_template_path_but_no_repo(self, KojiWrapper, link,
IsoWrapper, get_file_size, IsoWrapper, get_file_size,
get_mtime, ImageCls, run): get_mtime, ImageCls, run):
compose = helpers.DummyCompose(self.topdir, {
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
})
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'Everything', 'source_repo_from': 'Everything',
@ -222,7 +216,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t = ostree.OstreeInstallerThread(pool) t = ostree.OstreeInstallerThread(pool)
with self.assertRaises(RuntimeError) as ctx: with self.assertRaises(RuntimeError) as ctx:
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
self.assertIn('template_repo', str(ctx.exception)) self.assertIn('template_repo', str(ctx.exception))
@ -237,12 +231,6 @@ class OstreeThreadTest(helpers.PungiTestCase):
def test_run_clone_templates(self, KojiWrapper, link, IsoWrapper, def test_run_clone_templates(self, KojiWrapper, link, IsoWrapper,
get_file_size, get_mtime, ImageCls, run, get_file_size, get_mtime, ImageCls, run,
get_dir_from_scm): get_dir_from_scm):
compose = helpers.DummyCompose(self.topdir, {
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
})
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'Everything', 'source_repo_from': 'Everything',
@ -265,7 +253,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t = ostree.OstreeInstallerThread(pool) t = ostree.OstreeInstallerThread(pool)
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
self.assertEqual(get_dir_from_scm.call_args_list, self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'git://example.com/templates.git', [mock.call({'scm': 'git', 'repo': 'git://example.com/templates.git',
@ -281,6 +269,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--variant=Everything', '--variant=Everything',
'--nomacboot', '--nomacboot',
'--isfinal', '--isfinal',
'--volid=test-Everything-x86_64',
'--add-template=%s/some_file.txt' % templ_dir, '--add-template=%s/some_file.txt' % templ_dir,
'--add-arch-template=%s/other_file.txt' % templ_dir, '--add-arch-template=%s/other_file.txt' % templ_dir,
self.topdir + '/work/x86_64/Everything/ostree_installer'], self.topdir + '/work/x86_64/Everything/ostree_installer'],
@ -295,9 +284,9 @@ class OstreeThreadTest(helpers.PungiTestCase):
final_iso_path)]) final_iso_path)])
self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)])
self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)])
self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertImageAdded(self.compose, ImageCls, IsoWrapper)
self.assertEqual(compose.get_image_name.call_args_list, self.assertEqual(self.compose.get_image_name.call_args_list,
[mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) [mock.call('x86_64', self.compose.variants['Everything'], disc_type='ostree')])
self.assertTrue(os.path.isdir(self.topdir + '/work/x86_64/Everything/')) 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.assertFalse(os.path.isdir(self.topdir + '/work/x86_64/Everything/ostree_installer'))
self.assertEqual(run.call_args_list, self.assertEqual(run.call_args_list,
@ -312,12 +301,6 @@ class OstreeThreadTest(helpers.PungiTestCase):
@mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper') @mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
def test_run_with_implicit_release(self, KojiWrapper, link, IsoWrapper, def test_run_with_implicit_release(self, KojiWrapper, link, IsoWrapper,
get_file_size, get_mtime, ImageCls, run): get_file_size, get_mtime, ImageCls, run):
compose = helpers.DummyCompose(self.topdir, {
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
})
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'Everything', 'source_repo_from': 'Everything',
@ -347,7 +330,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t = ostree.OstreeInstallerThread(pool) t = ostree.OstreeInstallerThread(pool)
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
self.assertEqual( self.assertEqual(
koji.get_runroot_cmd.call_args_list, koji.get_runroot_cmd.call_args_list,
@ -359,6 +342,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--variant=Everything', '--variant=Everything',
'--nomacboot', '--nomacboot',
'--isfinal', '--isfinal',
'--volid=test-Everything-x86_64',
'--installpkgs=fedora-productimg-atomic', '--installpkgs=fedora-productimg-atomic',
'--add-template=/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl', '--add-template=/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl',
'--add-arch-template=/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl', '--add-arch-template=/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl',
@ -379,9 +363,9 @@ class OstreeThreadTest(helpers.PungiTestCase):
final_iso_path)]) final_iso_path)])
self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_file_size.call_args_list, [mock.call(final_iso_path)])
self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)]) self.assertEqual(get_mtime.call_args_list, [mock.call(final_iso_path)])
self.assertImageAdded(compose, ImageCls, IsoWrapper) self.assertImageAdded(self.compose, ImageCls, IsoWrapper)
self.assertEqual(compose.get_image_name.call_args_list, self.assertEqual(self.compose.get_image_name.call_args_list,
[mock.call('x86_64', compose.variants['Everything'], disc_type='ostree')]) [mock.call('x86_64', self.compose.variants['Everything'], disc_type='ostree')])
@mock.patch('kobo.shortcuts.run') @mock.patch('kobo.shortcuts.run')
@mock.patch('productmd.images.Image') @mock.patch('productmd.images.Image')
@ -392,12 +376,6 @@ class OstreeThreadTest(helpers.PungiTestCase):
@mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper') @mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
def test_fail_crash(self, KojiWrapper, link, IsoWrapper, get_file_size, def test_fail_crash(self, KojiWrapper, link, IsoWrapper, get_file_size,
get_mtime, ImageCls, run): get_mtime, ImageCls, run):
compose = helpers.DummyCompose(self.topdir, {
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
})
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'Everything', 'source_repo_from': 'Everything',
@ -409,8 +387,8 @@ class OstreeThreadTest(helpers.PungiTestCase):
t = ostree.OstreeInstallerThread(pool) t = ostree.OstreeInstallerThread(pool)
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
compose.log_info.assert_has_calls([ self.compose.log_info.assert_has_calls([
mock.call('[FAIL] Ostree installer (variant Everything, arch x86_64) failed, but going on anyway.'), mock.call('[FAIL] Ostree installer (variant Everything, arch x86_64) failed, but going on anyway.'),
mock.call('BOOM') mock.call('BOOM')
]) ])
@ -424,12 +402,6 @@ class OstreeThreadTest(helpers.PungiTestCase):
@mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper') @mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
def test_fail_runroot_fail(self, KojiWrapper, link, IsoWrapper, def test_fail_runroot_fail(self, KojiWrapper, link, IsoWrapper,
get_file_size, get_mtime, ImageCls, run): get_file_size, get_mtime, ImageCls, run):
compose = helpers.DummyCompose(self.topdir, {
'release_name': 'Fedora',
'release_version': 'Rawhide',
'koji_profile': 'koji',
'runroot_tag': 'rrt',
})
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'Everything', 'source_repo_from': 'Everything',
@ -445,8 +417,8 @@ class OstreeThreadTest(helpers.PungiTestCase):
t = ostree.OstreeInstallerThread(pool) t = ostree.OstreeInstallerThread(pool)
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
compose.log_info.assert_has_calls([ self.compose.log_info.assert_has_calls([
mock.call('[FAIL] Ostree installer (variant Everything, arch x86_64) failed, but going on anyway.'), mock.call('[FAIL] Ostree installer (variant Everything, arch x86_64) failed, but going on anyway.'),
mock.call('Runroot task failed: 1234. See %s/logs/x86_64/ostree_installer/runroot.log for more details.' mock.call('Runroot task failed: 1234. See %s/logs/x86_64/ostree_installer/runroot.log for more details.'
% self.topdir) % self.topdir)