diff --git a/koji/__init__.py b/koji/__init__.py index 5706c76c..43f64c0b 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -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), diff --git a/tests/test_cli/test_mock_config.py b/tests/test_cli/test_mock_config.py index a70a4312..cc7fd605 100644 --- a/tests/test_cli/test_mock_config.py +++ b/tests/test_cli/test_mock_config.py @@ -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' diff --git a/tests/test_lib/data/mock/internaldev.out b/tests/test_lib/data/mock/internaldev.out index e3126f12..efddcfba 100644 --- a/tests/test_lib/data/mock/internaldev.out +++ b/tests/test_lib/data/mock/internaldev.out @@ -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 diff --git a/tests/test_lib/data/mock/internaldev2.out b/tests/test_lib/data/mock/internaldev2.out index 318d3e8f..144b2422 100644 --- a/tests/test_lib/data/mock/internaldev2.out +++ b/tests/test_lib/data/mock/internaldev2.out @@ -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 diff --git a/tests/test_lib/data/mock/simple.out b/tests/test_lib/data/mock/simple.out index b5bb7fd5..059f20cb 100644 --- a/tests/test_lib/data/mock/simple.out +++ b/tests/test_lib/data/mock/simple.out @@ -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'