Skip to content

Commit 92d0c68

Browse files
committed
Use mock bootstrap images when possible
Resolves: AlmaLinux/build-system#483
1 parent 032bc1b commit 92d0c68

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

build_node/builders/base_rpm_builder.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,11 @@ def generate_mock_config(config, task, srpm_build=False):
659659
repositories=yum_repos,
660660
**yum_config_kwargs,
661661
)
662-
mock_config_kwargs = {'use_bootstrap_container': False, 'macros': {}}
662+
mock_config_kwargs = {
663+
'use_bootstrap': True, 'use_bootstrap_image': False,
664+
'macros': {}
665+
}
666+
663667
target_arch = task.arch
664668
use_host_resolv = True
665669
if target_arch == 'src':
@@ -677,6 +681,10 @@ def generate_mock_config(config, task, srpm_build=False):
677681
continue
678682
elif key == 'use_host_resolv':
679683
use_host_resolv = value
684+
elif key == 'bootstrap_image':
685+
if target_arch not in ('x86_64_v2', 'i686'):
686+
mock_config_kwargs['use_bootstrap_image'] = True
687+
mock_config_kwargs['bootstrap_image'] = value
680688
else:
681689
mock_config_kwargs[key] = value
682690
mock_config = MockConfig(

0 commit comments

Comments
 (0)