From 7a7ff1757e75e9d1babb26a8e9cc755833582271 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 9 Feb 2021 11:19:43 -0800 Subject: [PATCH] Always use rootfs size of 3GiB in installer build test This is how our Pungi config has been set up since F32, so we should match it here to be accurate. Signed-off-by: Adam Williamson --- tests/_installer_build.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/_installer_build.pm b/tests/_installer_build.pm index 958773b2..8d14cfce 100644 --- a/tests/_installer_build.pm +++ b/tests/_installer_build.pm @@ -16,11 +16,8 @@ sub run { assert_script_run "mkdir -p /root/imgbuild"; assert_script_run "pushd /root/imgbuild"; assert_script_run "setenforce Permissive"; - my $cmd = "lorax -p Fedora -v ${version} -r ${version} --repo=/etc/yum.repos.d/fedora.repo"; - # rootfs in F30 installer images seems to have got very big at - # some point, let's work around that for now: - # https://bodhi.fedoraproject.org/updates/FEDORA-2020-1070052d10#comment-1284223 - $cmd .= " --rootfs-size 3" if ($version eq 30); + # Fedora pungi config always sets rootfs size to 3GiB since F32 + my $cmd = "lorax -p Fedora -v ${version} -r ${version} --repo=/etc/yum.repos.d/fedora.repo --rootfs-size 3"; unless ($version > $currrel) { $cmd .= " --isfinal --repo=/etc/yum.repos.d/fedora-updates.repo"; }