PR#1073: Merge PR:897 - koji

koji

#1073 Merge PR:897

Closed 5 years ago by mikem. Opened 5 years ago by franzh.

franzh/koji merge-pr897 into koji-1.16-updates

PR#897: Fix use_host_resolv with new mock version (2017 Nov 22+)

Franz Chih-Ping Hsieh • 5 years ago

73826e9

builder/kojid

file modified

		`@@ -242,6 +242,8 @@`
		`if hasattr(self.options, k):`
		`opts[k] = getattr(self.options, k)`
		`opts['buildroot_id'] = self.id`
		`+ if self.setup_dns:`
		`+ opts['rpmbuild_networking'] = True`
		`opts['use_host_resolv'] = self.setup_dns`
		`opts['install_group'] = self.install_group`
		`opts['maven_opts'] = self.maven_opts`

koji/__init__.py

file modified

		`@@ -1443,6 +1443,7 @@`
		`# Use the group data rather than a generated rpm`
		`'chroot_setup_cmd': 'groupinstall %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),`
		`# Don't let a build last more than 24 hours`
		`'rpmbuild_timeout': opts.get('rpmbuild_timeout', 86400)`

tests/test_lib/data/mock/internaldev.out

file modified

		`@@ -5,6 +5,7 @@`
		`config_opts['chroothome'] = '/builddir'`
		`config_opts['internal_dev_setup'] = False`
		`config_opts['root'] = 'ROOTNAME'`
		`+ config_opts['rpmbuild_networking'] = False`
		`config_opts['rpmbuild_timeout'] = 86400`
		`config_opts['target_arch'] = 'x86_64'`
		`config_opts['use_host_resolv'] = False`

tests/test_lib/data/mock/internaldev2.out

file modified

		`@@ -5,6 +5,7 @@`
		`config_opts['chroothome'] = '/builddir'`
		`config_opts['internal_dev_setup'] = True`
		`config_opts['root'] = 'ROOTNAME'`
		`+ config_opts['rpmbuild_networking'] = False`
		`config_opts['rpmbuild_timeout'] = 86400`
		`config_opts['target_arch'] = 'x86_64'`
		`config_opts['use_host_resolv'] = False`

tests/test_lib/data/mock/simple.out

file modified

		`@@ -4,6 +4,7 @@`
		`config_opts['chroot_setup_cmd'] = 'groupinstall build'`
		`config_opts['chroothome'] = '/builddir'`
		`config_opts['root'] = 'ROOTNAME'`
		`+ config_opts['rpmbuild_networking'] = False`
		`config_opts['rpmbuild_timeout'] = 86400`
		`config_opts['target_arch'] = 'x86_64'`
		`config_opts['use_host_resolv'] = False`

franzh commented 5 years ago

We found a critical issue that Koji builds fail on Fedora with error "Could not resolve host: src.fedoraproject.org". That's because the rpmbuild_networking is disabled in buildroot. The PR#897 fix the issue and we think it is necessary for koji-1.16.1

julian8628 commented 5 years ago

This problem only happens on mock-1.4.9-1+
one workaround is using proper version of mock

mikem commented 5 years ago

For backporting a single PR to update branches with a separate PR like this, don't use the cherry-pick-merge script. This PR will be its own merge; we don't need another merge within it.

I'll fix this when I merge it.

rebased onto 73826e9

5 years ago

mikem commented 5 years ago

Merged by commit cc04992