almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

Implement version.compose_id version generator

Browse Source 
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
Patrick Uiterwijk 2017-11-06 16:13:49 +01:00
parent 1a10a1fe83
commit 1dbd0248d4
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pungi/util.py
View File

@ -782,9 +782,12 @@ def version_generator(compose, gen):
""" """
if gen == '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN': if gen == '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN':
return '%s.%s' % (compose.image_version, compose.image_release) return '%s.%s' % (compose.image_version, compose.image_release)
if gen == '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN': elif gen == '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN':
return compose.image_release return compose.image_release
if gen and gen[0] == '!': elif gen == '!RELEASE_FROM_VERSION_COMPOSE_ID':
return '%s.%s' % (compose.ci_base.release.version,
compose.ci_base.id)
elif gen and gen[0] == '!':
raise RuntimeError("Unknown version generator '%s'" % gen) raise RuntimeError("Unknown version generator '%s'" % gen)
return gen return gen

18
tests/test_util.py
View File

@ -601,6 +601,20 @@ class GetRepoFuncsTestCase(unittest.TestCase):
class TestVersionGenerator(unittest.TestCase): class TestVersionGenerator(unittest.TestCase):
def setUp(self):
ci = mock.MagicMock()
ci.respin = 0
ci.id = 'RHEL-8.0-20180101.0'
ci.release.version = '8'
ci.date = '20160101'
ci.type = 'nightly'
ci.type_suffix = ''
ci.label = 'RC-1.0'
ci.label_major_version = '1'
self.compose = mock.MagicMock()
self.compose.ci_base = ci
def test_unknown_generator(self): def test_unknown_generator(self):
compose = mock.Mock() compose = mock.Mock()
with self.assertRaises(RuntimeError) as ctx: with self.assertRaises(RuntimeError) as ctx:
@ -617,6 +631,10 @@ class TestVersionGenerator(unittest.TestCase):
compose = mock.Mock() compose = mock.Mock()
self.assertEqual(util.version_generator(compose, None), None) self.assertEqual(util.version_generator(compose, None), None)
def test_release_from_version_compose_id(self):
self.assertEqual(util.version_generator(self.compose, '!RELEASE_FROM_VERSION_COMPOSE_ID'),
'8.RHEL-8.0-20180101.0')
class TestTZOffset(unittest.TestCase): class TestTZOffset(unittest.TestCase):
@mock.patch('time.daylight', new=False) @mock.patch('time.daylight', new=False)