modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-11-04 06:15:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the devel Koji CG build optional using a config option

Browse Source
This commit is contained in:
mprahl
2018-11-28 15:57:59 -05:00
parent 6abb585cdc
commit 25b6a93a07
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module_build_service/builder/KojiModuleBuilder.py
View File

@@ -1201,7 +1201,8 @@ chmod 644 %buildroot/etc/rpm/macros.zz-modules
if self.config.koji_enable_content_generator and self.module.state == 3:
cg = KojiContentGenerator(self.module, self.config)
cg.koji_import()
cg.koji_import(devel=True)
if conf.koji_cg_devel_module:
cg.koji_import(devel=True)
@staticmethod
def get_rpm_module_tag(rpm):

4
module_build_service/config.py
View File

@@ -428,6 +428,10 @@ class Config(object):
'default': True,
'desc': 'Indicate whether tagging build is enabled during importing '
'module to Koji.'},
'koji_cg_devel_module': {
'type': bool,
'default': True,
'desc': 'Indicate whether a devel module should be imported into Koji.'},
'koji_cg_build_tag_template': {
'type': str,
'default': "{}-modular-updates-candidate",

27
tests/test_builder/test_koji.py
View File

@@ -639,6 +639,33 @@ class TestKojiBuilder:
rv = KojiModuleBuilder._get_filtered_rpms_on_self_dep(current_module, br_filtered_rpms)
assert set(rv) == set(expected)
@pytest.mark.parametrize('cg_enabled,cg_devel_enabled', [
(False, False),
(True, False),
(True, True),
])
@mock.patch('module_build_service.builder.KojiModuleBuilder.KojiContentGenerator')
def test_finalize(self, mock_koji_cg_cls, cg_enabled, cg_devel_enabled):
self.module.state = 3
with patch('module_build_service.config.Config.koji_enable_content_generator',
new_callable=mock.PropertyMock, return_value=cg_enabled):
with patch('module_build_service.config.Config.koji_cg_devel_module',
new_callable=mock.PropertyMock, return_value=cg_devel_enabled):
builder = FakeKojiModuleBuilder(
owner=self.module.owner, module=self.module, config=conf,
tag_name='module-nginx-1.2', components=[])
builder.finalize()
mock_koji_cg = mock_koji_cg_cls.return_value
if cg_enabled:
if cg_devel_enabled:
assert mock_koji_cg.koji_import.call_count == 2
mock_koji_cg.koji_import.assert_has_calls([mock.call(), mock.call(devel=True)])
else:
mock_koji_cg.koji_import.assert_called_once_with()
else:
mock_koji_cg.koji_import.assert_not_called()
class TestGetDistTagSRPM:
"""Test KojiModuleBuilder.get_disttag_srpm"""