koji_builder: drop local site config to add /dev/fuse

We added local site config to make sure there was a /dev/fuse in the
mock nspawn container in order to get ostree oci image building working
correctly. Now in mock 5.x, /dev/fuse is automatically setup/added, so
we need to drop our local config so it doesn't conflict with the
internal upstream version now.

See: https://github.com/rpm-software-management/mock/issues/1188

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2023-09-26 15:14:03 -07:00
parent 8d2eae16e4
commit 202cffc5ff

View file

@ -12,11 +12,6 @@ config_opts['dnf_warning'] = False
# We need to set this to get ostree_installer runroot jobs working
# https://bugzilla.redhat.com/show_bug.cgi?id=2123812
config_opts['nspawn_args'] += ['--capability=cap_mac_admin']
# We need to set this to get rpm-ostree unified images working
# https://pagure.io/fedora-infrastructure/issue/11420
config_opts['plugin_conf']['bind_mount_enable'] = True
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(("/dev/fuse", "/dev/fuse"))
config_opts['nspawn_args'] += ['--bind=/dev/fuse']
{% endif %}
config_opts['dnf_command'] = '/usr/bin/dnf-3'
config_opts['system_dnf_command'] = '/usr/bin/dnf-3'