From 3dd33e3ef1672b156bb7dcf554b8a7d9d699682e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 15 Sep 2020 14:21:07 -0700
Subject: [PATCH] Use workarounds repo for installer and live build tests

Need this to pull in the kernel fix that's breaking install tests
at the moment.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/_installer_build.pm | 2 +-
 tests/_live_build.pm      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/_installer_build.pm b/tests/_installer_build.pm
index 980f2580..c96cd950 100644
--- a/tests/_installer_build.pm
+++ b/tests/_installer_build.pm
@@ -24,7 +24,7 @@ sub run {
     unless ($version > $currrel) {
         $cmd .= " --isfinal --repo=/etc/yum.repos.d/fedora-updates.repo";
     }
-    $cmd .= " --repo=/etc/yum.repos.d/advisory.repo ./results";
+    $cmd .= " --repo=/etc/yum.repos.d/advisory.repo --repo=/etc/yum.repos.d/workarounds.repo ./results";
     assert_script_run $cmd, 1500;
     assert_script_run "mv results/images/boot.iso ./${advortask}-netinst-${arch}.iso";
     upload_asset "./${advortask}-netinst-x86_64.iso";
diff --git a/tests/_live_build.pm b/tests/_live_build.pm
index 5b6285ba..6de91503 100644
--- a/tests/_live_build.pm
+++ b/tests/_live_build.pm
@@ -30,6 +30,8 @@ sub run {
     assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/dev/' . $serialdev . '\', \'/dev/' . $serialdev . '\'))" >> /etc/mock/openqa.cfg';
     # add the side repo to the config
     assert_script_run 'printf "config_opts[\'dnf.conf\'] += \"\"\"\n[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n\"\"\"" >> /etc/mock/openqa.cfg';
+    # and the workarounds repo
+    assert_script_run 'printf "config_opts[\'dnf.conf\'] += \"\"\"\n[workarounds]\nname=Workarounds repo\nbaseurl=file:///opt/workarounds_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n\"\"\"" >> /etc/mock/openqa.cfg';
     # replace metalink with mirrorlist so we don't get slow mirrors
     repos_mirrorlist("/etc/mock/openqa.cfg");
     # upload the config so we can check it's OK
@@ -40,6 +42,8 @@ sub run {
     assert_script_run "git checkout f${version}";
     # now add the side repo to fedora-repo-not-rawhide.ks
     assert_script_run 'echo "repo --name=advisory --baseurl=file:///opt/update_repo" >> fedora-repo-not-rawhide.ks';
+    # and the workarounds repo
+    assert_script_run 'echo "repo --name=workarounds --baseurl=file:///opt/workarounds_repo" >> fedora-repo-not-rawhide.ks';
     # now flatten the kickstart
     assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks";
     # upload the kickstart so we can check it