From 8515e203025aa7f787b75f43de4a66a4def60aa5 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Apr 22 2018 05:44:11 +0000 Subject: [PATCH 1/2] Fix use_host_resolv with new mock version (2017 Nov 22+) The change done in mock on 2017 Nov 22: 782e150ffda41c55351c56eff6601a2cc1b8e4fe / [RHBZ#1514028] now requires rpmbuild_networking to be used together with use_host_resolv otherwise it does not have an affect. While setting up Fedora RISC-V koji instance we noticed that /etc/resolv.conf was never copied into chroot, while /ets/hosts was always present. The following was tested on Fedora RISC-V instance and resolved the original problem (buildSRPMFromSCM was failing on fedpkg sources as it couldn't resolve src.fedoraproject.org) Signed-off-by: David Abdurachmanov --- diff --git a/builder/kojid b/builder/kojid index a058689..ef16ca3 100755 --- a/builder/kojid +++ b/builder/kojid @@ -241,6 +241,8 @@ class BuildRoot(object): 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 diff --git a/koji/__init__.py b/koji/__init__.py index 039ef1a..8dcc86b 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1443,6 +1443,7 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts) # 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) From f584e81bd3334c2cebc111e08a1cc8be0a024cf5 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Apr 22 2018 07:12:54 +0000 Subject: [PATCH 2/2] Add missing config_opts['rpmbuild_networking'] to mock test data Signed-off-by: David Abdurachmanov --- diff --git a/tests/test_lib/data/mock/internaldev.out b/tests/test_lib/data/mock/internaldev.out index a9bd710..1d8eaf8 100644 --- a/tests/test_lib/data/mock/internaldev.out +++ b/tests/test_lib/data/mock/internaldev.out @@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'groupinstall build' 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 diff --git a/tests/test_lib/data/mock/internaldev2.out b/tests/test_lib/data/mock/internaldev2.out index 034dc79..4cea97f 100644 --- a/tests/test_lib/data/mock/internaldev2.out +++ b/tests/test_lib/data/mock/internaldev2.out @@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'groupinstall build' 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 diff --git a/tests/test_lib/data/mock/simple.out b/tests/test_lib/data/mock/simple.out index 71d5dae..3aad8ff 100644 --- a/tests/test_lib/data/mock/simple.out +++ b/tests/test_lib/data/mock/simple.out @@ -4,6 +4,7 @@ config_opts['basedir'] = '/var/lib/mock' 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