srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 07:13:09 +00:00
Code Issues Releases Activity

live_build: tweak mock config used for Rawhide

Browse Source 
The numbered config file won't always exist right after branch
(there is no fedora-40-x86_64 now, for e.g.) But the named one
always does. This additional variable is a small price to pay for
making the test more robust.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-08-09 14:26:02 -07:00
parent 53bd47d909
commit 98bb256950
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/_live_build.pm
View File

@ -14,11 +14,13 @@ sub run {
$branch = "main"; $branch = "main";
$repoks = "fedora-repo-rawhide.ks"; $repoks = "fedora-repo-rawhide.ks";
$releasever = "Rawhide"; $releasever = "Rawhide";
$mockver = "rawhide";
} }
else { else {
$branch = "f${version}"; $branch = "f${version}";
$repoks = "fedora-repo-not-rawhide.ks"; $repoks = "fedora-repo-not-rawhide.ks";
$releasever = $version; $releasever = $version;
$mockver = $version;
} }
my $advortask = get_var("ADVISORY_OR_TASK"); my $advortask = get_var("ADVISORY_OR_TASK");
my $arch = get_var("ARCH"); my $arch = get_var("ARCH");
@ -40,7 +42,7 @@ sub run {
# install the tools we need # install the tools we need
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-${version}-${arch}.cfg')\" > /etc/mock/openqa.cfg"; assert_script_run "echo \"include('/etc/mock/fedora-${mockver}-${arch}.cfg')\" > /etc/mock/openqa.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"));