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

When no architecture is set in Koji tag, fallback to conf.arches

Browse Source
This commit is contained in:
Jan Kaluza
2019-06-19 12:44:29 +02:00
parent 6a850e4996
commit c9d2b77167
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_build_service/builder/KojiModuleBuilder.py
View File

@@ -1322,4 +1322,6 @@ class KojiModuleBuilder(GenericBuilder):
tag = koji_session.getTag(module.koji_tag)
if not tag:
raise ValueError("Unknown Koji tag %r." % module.koji_tag)
if not tag["arches"]:
return []
return tag["arches"].split(" ")

11
tests/test_utils/test_utils.py
View File

@@ -319,6 +319,17 @@ class TestUtils:
r = module_build_service.utils.get_build_arches(mmd, conf)
assert r == ["ppc64le"]
@patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession")
def test_get_build_arches_no_arch_set(self, ClientSession):
"""
When no architecture is set in Koji tag, fallback to conf.arches.
"""
session = ClientSession.return_value
session.getTag.return_value = {"arches": ""}
mmd = load_mmd_file(path.join(BASE_DIR, "..", "staged_data", "formatted_testmodule.yaml"))
r = module_build_service.utils.get_build_arches(mmd, conf)
assert set(r) == set(conf.arches)
@patch(
"module_build_service.config.Config.allowed_privileged_module_names",
new_callable=mock.PropertyMock,