robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ostree] Allow adding versioning metadata

Browse source 
Added new option '--version' to pungi-make-ostree, and this can be
enabled in ostree settings with 'version'. The version string will be
added as versioning metadata if this is specified.

Signed-off-by: Qixiang Wan <qwan@redhat.com>
This commit is contained in:
Qixiang Wan 2016-11-04 16:07:26 +08:00
parent 133b6a5cf5
commit fa3c5aff63
6 changed files with 72 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/test_ostree_script.py
View file

@ -102,6 +102,27 @@ class OstreeScriptTest(helpers.PungiTestCase):
mock.call(['ostree', 'summary', '-u', '--repo=%s' % repo],
logfile=self.topdir + '/logs/Atomic/ostree-summary.log', show_cmd=True, stdout=True)]),
@mock.patch('kobo.shortcuts.run')
def test_versioning_metadata(self, run):
repo = os.path.join(self.topdir, 'atomic')
ostree.main([
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s/fedora-atomic-docker-host.json' % self.topdir,
'--version=24',
repo,
])
self.maxDiff = None
self.assertItemsEqual(
run.call_args_list,
[mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'],
logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True),
mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo,
'--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'),
'--add-metadata-string=version=24',
self.topdir + '/fedora-atomic-docker-host.json'],
logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)])
if __name__ == '__main__':
unittest.main()