From c9d2b77167aba5350f72f8274283024da054f22b Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Wed, 19 Jun 2019 12:44:29 +0200
Subject: [PATCH] When no architecture is set in Koji tag, fallback to
 conf.arches

---
 module_build_service/builder/KojiModuleBuilder.py |  2 ++
 tests/test_utils/test_utils.py                    | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py
index 6c7c2835..112f50b3 100644
--- a/module_build_service/builder/KojiModuleBuilder.py
+++ b/module_build_service/builder/KojiModuleBuilder.py
@@ -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(" ")
diff --git a/tests/test_utils/test_utils.py b/tests/test_utils/test_utils.py
index 46127825..2abe6975 100644
--- a/tests/test_utils/test_utils.py
+++ b/tests/test_utils/test_utils.py
@@ -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,