From 98bb256950119e21c314d04e00a46da1a96d4ceb Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 9 Aug 2023 14:26:02 -0700
Subject: [PATCH] live_build: tweak mock config used for Rawhide

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>
---
 tests/_live_build.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/_live_build.pm b/tests/_live_build.pm
index 38e45a47..e93beb70 100644
--- a/tests/_live_build.pm
+++ b/tests/_live_build.pm
@@ -14,11 +14,13 @@ sub run {
         $branch = "main";
         $repoks = "fedora-repo-rawhide.ks";
         $releasever = "Rawhide";
+        $mockver = "rawhide";
     }
     else {
         $branch = "f${version}";
         $repoks = "fedora-repo-not-rawhide.ks";
         $releasever = $version;
+        $mockver = $version;
     }
     my $advortask = get_var("ADVISORY_OR_TASK");
     my $arch = get_var("ARCH");
@@ -40,7 +42,7 @@ sub run {
     # install the tools we need
     assert_script_run "dnf -y install mock git pykickstart tar", 120;
     # 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
     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"));