1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-15 03:03:11 +00:00

Drop _live_build mock config corrections for F39 and F40

These should no longer be needed with the new mock-core-configs
and mock. Tested on stg.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-08-10 12:53:54 -07:00
parent edcfed346d
commit 94a743b37e

View File

@ -44,15 +44,6 @@ sub run {
assert_script_run "dnf -y install mock git pykickstart tar", 120; assert_script_run "dnf -y install mock git pykickstart tar", 120;
# base mock config on original # base mock config on original
assert_script_run "echo \"include('/etc/mock/fedora-${mockver}-${arch}.cfg')\" > /etc/mock/openqa.cfg"; 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";
}
elsif ($version eq "39") {
# similar corrections for F39, while mock still thinks it's Rawhide
assert_script_run "sed -e 's,38,39,g' /etc/mock/fedora-38-${arch}.cfg > /etc/mock/fedora-39-${arch}.cfg";
}
# make the side and workarounds repos and the serial device available inside the mock root # 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_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")); 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"));