From 1fdd572db595d16f3969b3b3c57d15668f9a462c Mon Sep 17 00:00:00 2001 From: Luiz Carvalho Date: Aug 12 2019 20:13:25 +0000 Subject: Ensure arch_override is str type The koji_containerbuild plugin requires the parameter "arch_override" to be of type str. Signed-off-by: Luiz Carvalho --- diff --git a/freshmaker/lightblue.py b/freshmaker/lightblue.py index 560df50..7a69f79 100644 --- a/freshmaker/lightblue.py +++ b/freshmaker/lightblue.py @@ -262,11 +262,17 @@ class ContainerImage(dict): if not conf.supply_arch_overrides: data['arches'] = None else: - archives = session.list_archives(build_id=build['build_id']) - data['arches'] = [archive['extra']['image']['arch'] for archive in archives if archive['btype'] == 'image'] + data['arches'] = self._get_arches_from_koji(session, build['build_id']) return data + def _get_arches_from_koji(self, koji_session, build_id): + archives = koji_session.list_archives(build_id=build_id) + arches = [ + archive['extra']['image']['arch'] + for archive in archives if archive['btype'] == 'image'] + return ' '.join(sorted(arches)) + @region.cache_on_arguments() def _get_additional_data_from_distgit(self, repository, branch, commit): """ diff --git a/tests/test_lightblue.py b/tests/test_lightblue.py index 9135152..19fced0 100644 --- a/tests/test_lightblue.py +++ b/tests/test_lightblue.py @@ -421,7 +421,7 @@ class TestContainerImageObject(helpers.FreshmakerTestCase): self.assertEqual(self.dummy_image["repository"], "rpms/repo-1") self.assertEqual(self.dummy_image["commit"], "commit_hash1") self.assertEqual(self.dummy_image["target"], "target1") - self.assertEqual(self.dummy_image["arches"], ['ppc64le', 's390x']) + self.assertEqual(self.dummy_image["arches"], 'ppc64le s390x') @patch('freshmaker.kojiservice.KojiService.get_build') @patch('freshmaker.kojiservice.KojiService.get_task_request')