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

[checksums] Add label to file name

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-03-16 08:33:43 +01:00
parent aa38eb1fd7
commit aab22b6f9f
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configuration.rst
View File

@ -954,7 +954,7 @@ Media Checksums Settings
It is possible to use format strings that will be replace by actual values. It is possible to use format strings that will be replace by actual values.
The allowed keys are ``%(release_showrt)s``, ``%(release_short)s``, The allowed keys are ``%(release_showrt)s``, ``%(release_short)s``,
``%(release_id)s``, ``%(variant)s``, ``%(version)s``, ``%(date)s``, ``%(release_id)s``, ``%(variant)s``, ``%(version)s``, ``%(date)s``,
``%(type_suffix)s`` and ``%(respin)s`` ``%(type_suffix)s``, ``%(label)s`` and ``%(respin)s``
For example, for Fedora the prefix should be For example, for Fedora the prefix should be
``%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s``. ``%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s``.

1
pungi/phases/image_checksum.py
View File

@ -80,6 +80,7 @@ class ImageChecksumPhase(PhaseBase):
'date': self.compose.compose_date, 'date': self.compose.compose_date,
'type_suffix': self.compose.compose_type_suffix, 'type_suffix': self.compose.compose_type_suffix,
'respin': self.compose.compose_respin, 'respin': self.compose.compose_respin,
'label': self.compose.compose_label,
} }
base_checksum_name += '-' base_checksum_name += '-'
return base_checksum_name return base_checksum_name

1
tests/helpers.py
View File

@ -25,6 +25,7 @@ class DummyCompose(object):
self.compose_type_suffix = '.t' self.compose_type_suffix = '.t'
self.compose_respin = 0 self.compose_respin = 0
self.compose_id = 'Test-20151203.0.t' self.compose_id = 'Test-20151203.0.t'
self.compose_label = None
self.ci_base = mock.Mock( self.ci_base = mock.Mock(
release_id='Test-1.0', release_id='Test-1.0',
release=mock.Mock( release=mock.Mock(

5
tests/test_imagechecksumphase.py
View File

@ -86,8 +86,9 @@ class TestImageChecksumPhase(PungiTestCase):
compose = DummyCompose(self.topdir, { compose = DummyCompose(self.topdir, {
'media_checksums': ['sha256'], 'media_checksums': ['sha256'],
'media_checksum_one_file': True, 'media_checksum_one_file': True,
'media_checksum_base_filename': '%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s' 'media_checksum_base_filename': '%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s_%(label)s'
}) })
compose.compose_label = 'Alpha-1.0'
phase = ImageChecksumPhase(compose) phase = ImageChecksumPhase(compose)
@ -98,7 +99,7 @@ class TestImageChecksumPhase(PungiTestCase):
dump.assert_called_once_with(self.topdir + '/compose/Client/i386/iso', 'sha256', dump.assert_called_once_with(self.topdir + '/compose/Client/i386/iso', 'sha256',
{'image.iso': 'cafebabe'}, {'image.iso': 'cafebabe'},
'test-Client-1.0-20151203.t.0-CHECKSUM') 'test-Client-1.0-20151203.t.0_Alpha-1.0-CHECKSUM')
cc.assert_called_once_with(self.topdir + '/compose/Client/i386/iso/image.iso', ['sha256']) cc.assert_called_once_with(self.topdir + '/compose/Client/i386/iso/image.iso', ['sha256'])
compose.image.add_checksum.assert_called_once_with(None, 'sha256', 'cafebabe') compose.image.add_checksum.assert_called_once_with(None, 'sha256', 'cafebabe')