Skip to content

Pass shared_cache_key to MockConfig for shared yum cache builds #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrewlukoshko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass shared_cache_key to MockConfig for shared yum cache builds #221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build_node/builders/base_rpm_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,17 +689,25 @@ def generate_mock_config(config, task, srpm_build=False):
mock_config_kwargs['macros'].update(value)
elif key == 'rpmautospec_enable':
continue
elif key == 'use_shared_yum_cache':
continue
elif key == 'use_host_resolv':
use_host_resolv = value
else:
mock_config_kwargs[key] = value
shared_cache_key = None
if task.platform.data['mock'].get('use_shared_yum_cache'):
shared_cache_key = '{0}-{1}'.format(
task.platform.name.lower(), target_arch,
)
mock_config = MockConfig(
dist=task.platform.data.get('mock_dist'),
rpmbuild_networking=True,
use_host_resolv=use_host_resolv,
yum_config=yum_config,
target_arch=target_arch,
basedir=config.mock_basedir,
shared_cache_key=shared_cache_key,
**mock_config_kwargs,
)
if task.is_secure_boot:
Expand Down
Loading