particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use dnf5-compatible "group install" command

Browse source 
* yum knows only "yum groupinstall"
 * dnf < 5 knows both
 * dnf-5 only "dnf5 group install"

From RHEL5 version of yum, @group syntax is supported, so we can
replace all groupinstall commands with "install @group".

Related: https://pagure.io/koji/issue/3971
This commit is contained in:
Tomas Kopecek 2024-01-15 13:48:16 +01:00
parent dd128f8617
commit 4ad92b5cd6
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
koji/__init__.py
View file

@ -1806,7 +1806,7 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts)
'target_arch': opts.get('target_arch', arch),
'chroothome': '/builddir',
# Use the group data rather than a generated rpm
'chroot_setup_cmd': 'groupinstall %s' % opts.get('install_group', 'build'),
'chroot_setup_cmd': 'install @%s' % opts.get('install_group', 'build'),
# don't encourage network access from the chroot
'rpmbuild_networking': opts.get('use_host_resolv', False),
'use_host_resolv': opts.get('use_host_resolv', False),

2
tests/test_cli/test_mock_config.py
View file

@ -38,7 +38,7 @@ class TestMockConfig(utils.CliTestCase):
}
self.mock_output = """# Auto-generated by the Koji build system
config_opts['chroot_setup_cmd'] = 'groupinstall build'
config_opts['chroot_setup_cmd'] = 'install @build'
config_opts['use_host_resolv'] = False
config_opts['root'] = 'fedora26-build-repo_1'
config_opts['yum.conf'] = '[main]\ncachedir=/var/cache/yum\ndebuglevel=1\nlogfile=/var/log/yum.log\nreposdir=/dev/null\nretries=20\nobsoletes=1\ngpgcheck=0\nassumeyes=1\nkeepcache=1\ninstall_weak_deps=0\nstrict=1\n\n# repos\n\n[build]\nname=build\nbaseurl=https://fedora.local/kojifiles/repos/fedora26-build/1/x86_64\n'

2
tests/test_lib/data/mock/internaldev.out
View file

@ -1,7 +1,7 @@
# Auto-generated by the Koji build system
config_opts['basedir'] = '/var/lib/mock'
config_opts['chroot_setup_cmd'] = 'groupinstall build'
config_opts['chroot_setup_cmd'] = 'install @build'
config_opts['chroothome'] = '/builddir'
config_opts['dnf_warning'] = False
config_opts['internal_dev_setup'] = False

2
tests/test_lib/data/mock/internaldev2.out
View file

@ -1,7 +1,7 @@
# Auto-generated by the Koji build system
config_opts['basedir'] = '/var/lib/mock'
config_opts['chroot_setup_cmd'] = 'groupinstall build'
config_opts['chroot_setup_cmd'] = 'install @build'
config_opts['chroothome'] = '/builddir'
config_opts['dnf_warning'] = False
config_opts['internal_dev_setup'] = True

2
tests/test_lib/data/mock/simple.out
View file

@ -1,7 +1,7 @@
# Auto-generated by the Koji build system
config_opts['basedir'] = '/var/lib/mock'
config_opts['chroot_setup_cmd'] = 'groupinstall build'
config_opts['chroot_setup_cmd'] = 'install @build'
config_opts['chroothome'] = '/builddir'
config_opts['dnf_warning'] = False
config_opts['root'] = 'ROOTNAME'