From 8483e7bd82f038cd669b164dd2cecc1ec0f7bf67 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 9 Aug 2023 15:21:35 -0700 Subject: [PATCH] Workaround mock-core-configs not being updated for F39 branch mock still thinks the releasever for Rawhide is 39, which causes it to use the wrong GPG keys and not be able to install packages. This overrides that setting in our mock config file, until mock-core-configs is updated in the distro. Signed-off-by: Adam Williamson --- tests/_live_build.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/_live_build.pm b/tests/_live_build.pm index 0f05f5f5..fb5d5490 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -44,6 +44,11 @@ sub run { assert_script_run "dnf -y install mock git pykickstart tar", 120; # base mock config on original assert_script_run "echo \"include('/etc/mock/fedora-${mockver}-${arch}.cfg')\" > /etc/mock/openqa.cfg"; + if ($version eq $rawrel) { + # FIXME correct releasever for Rawhide: + # https://github.com/rpm-software-management/mock/issues/1177 + assert_script_run "echo \"config_opts['releasever'] = '${version}'\" >> /etc/mock/openqa.cfg"; + } # make the side and workarounds repos and the serial device available inside the mock root assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_enable\'] = True" >> /etc/mock/openqa.cfg'; assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/mnt/updateiso/update_repo\', \'/mnt/updateiso/update_repo\'))" >> /etc/mock/openqa.cfg' if (get_var("ISO_2"));