From 20b16e9345ba59695d9f8b501489c0a0351a4fc0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 20 Dec 2019 09:19:13 -0800 Subject: [PATCH] Drop a couple of obsolete workarounds from _installer_build F28-era stuff. Signed-off-by: Adam Williamson --- tests/_installer_build.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/tests/_installer_build.pm b/tests/_installer_build.pm index 647b3ef2..64e57d2b 100644 --- a/tests/_installer_build.pm +++ b/tests/_installer_build.pm @@ -8,19 +8,10 @@ sub run { my $version = get_var("VERSION"); my $advortask = get_var("ADVISORY_OR_TASK"); my $arch = get_var("ARCH"); - # we need lorax from u-t for f28 atm it seems - my $loraxcmd = "dnf -y "; - $loraxcmd .= "--enablerepo=updates-testing " if (get_var("VERSION") eq "28"); - $loraxcmd .= "install lorax"; - assert_script_run $loraxcmd, 90; + assert_script_run "dnf -y install lorax", 90; # this 'temporary file cleanup' thing can actually wipe bits of # the lorax install root while lorax is still running... assert_script_run "systemctl stop systemd-tmpfiles-clean.timer"; - # dracut-fips doesn't exist any more; this breaks f28 builds as - # it *did* exist when f28 came out, so lorax tries to use - # dracut-fips from the frozen release repo with newer lorax from - # the updates repo which obsoletes it, and gets confused - assert_script_run 'sed -i -e "s,dracut-fips,,g" /usr/share/lorax/templates.d/99-generic/runtime-install.tmpl'; assert_script_run "mkdir -p /root/imgbuild"; assert_script_run "pushd /root/imgbuild"; assert_script_run "setenforce Permissive";