ostree_installer: Pass --buildarch to lorax

This should tell lorax what arch to use and avoids fragile detection
based on contents of source repo.

It uses the same logic buildinstall phase uses to get the buildarch.

Related: https://pagure.io/teamsilverblue/issue/67
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

pungi/phases/ostree_installer.py

@@ -9,6 +9,7 @@ from kobo import shortcuts
 
 from .base import ConfigGuardedPhase, PhaseLoggerMixin
 from .. import util
+from ..arch import get_valid_arches
 from ..util import get_volid, get_repo_urls, version_generator, translate_path
 from ..wrappers import kojiwrapper, iso, lorax, scm
 
@@ -166,6 +167,7 @@ class OstreeInstallerThread(WorkerThread):
             variant=variant.uid,
             nomacboot=True,
             volid=volid,
+            buildarch=get_valid_arches(arch)[0],
             buildinstallpackages=config.get('installpkgs'),
             add_template=self._get_templates(config, 'add_template'),
             add_arch_template=self._get_templates(config, 'add_arch_template'),

tests/test_ostree_installer_phase.py

@@ -135,6 +135,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
         if isfinal:
             lorax_cmd.append('--isfinal')
 
+        lorax_cmd.append("--buildarch=x86_64")
         lorax_cmd.append('--volid=test-Everything-x86_64')
 
         if extra: