From 170a7d940fbd471415489451875b5ff6ad91791d Mon Sep 17 00:00:00 2001
From: Pat Riehecky <riehecky@fnal.gov>
Date: Dec 10 2025 16:58:06 +0000
Subject: Also set `bootstrap_forcearch` under forcearch flag.


Fixes: https://pagure.io/koji/issue/4511

Signed-off-by: Pat Riehecky <riehecky@fnal.gov>

---

diff --git a/builder/kojid b/builder/kojid
index 2f7f948..b62e31b 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -305,6 +305,7 @@ class BuildRoot(object):
         if 'mock.forcearch' in self.config['extra']:
             if bool(self.config['extra']['mock.forcearch']):
                 opts['forcearch'] = self.target_arch
+                opts['bootstrap_forcearch'] = self.target_arch
         if 'mock.package_manager' in self.config['extra']:
             opts['package_manager'] = self.config['extra']['mock.package_manager']
         if 'mock.yum.module_hotfixes' in self.config['extra']:
diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py
index 6eddb50..289b4c8 100644
--- a/cli/koji_cli/commands.py
+++ b/cli/koji_cli/commands.py
@@ -1214,6 +1214,7 @@ def anon_handle_mock_config(goptions, session, args):
         if 'mock.forcearch' in buildcfg['extra']:
             if bool(buildcfg['extra']['mock.forcearch']):
                 opts['forcearch'] = arch
+                opts['bootstrap_forcearch'] = arch
     if 'mock.package_manager' in buildcfg['extra']:
         opts['package_manager'] = buildcfg['extra']['mock.package_manager']
     if 'mock.yum.module_hotfixes' in buildcfg['extra']:
diff --git a/koji/__init__.py b/koji/__init__.py
index aab41a6..3ebd530 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -1837,6 +1837,7 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts)
     }
     if 'forcearch' in opts:
         config_opts['forcearch'] = opts['forcearch']
+        config_opts['bootstrap_forcearch'] = opts['bootstrap_forcearch']
     if opts.get('package_manager'):
         config_opts['package_manager'] = opts['package_manager']
     if opts.get('bootstrap_image'):
diff --git a/tests/test_cli/test_mock_config.py b/tests/test_cli/test_mock_config.py
index b4201e1..1d62fac 100644
--- a/tests/test_cli/test_mock_config.py
+++ b/tests/test_cli/test_mock_config.py
@@ -294,6 +294,7 @@ config_opts['macros']['%distribution'] = 'Koji Testing'
             'module_hotfixes': 1,
             'bootstrap_image': 'bootstrap_image_content',
             'forcearch': 'x86_64',
+            'bootstrap_forcearch': 'x86_64',
             'module_setup_commands': 'module_setup_commands_content',
             'releasever': 'releasever_content',
             'use_bootstrap': True,