testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Use a second disk for the update repo in image build tests

Browse Source 
This tweaks the update live and installer image build tests to
store the update repo on a separate disk. This should hopefully
avoid the tests failing due to insufficient disk space when the
update is huge (e.g. KDE or GNOME megaupdates).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-03-13 12:37:42 -07:00
parent 126109f8ac
commit 375575cd07
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/utils.pm
View File

@ -430,6 +430,17 @@ sub _repo_setup_updates {
# update and enabling it here, we ensure all later 'dnf install' calls # update and enabling it here, we ensure all later 'dnf install' calls
# will get the packages from the update. # will get the packages from the update.
assert_script_run "mkdir -p /opt/update_repo"; assert_script_run "mkdir -p /opt/update_repo";
# if NUMDISKS is above 1, assume we want to put the update repo on
# the other disk (to avoid huge updates exhausting space on the main
# disk)
if (get_var("NUMDISKS") > 1) {
# I think the disk will always be vdb. This creates a single large
# partition.
assert_script_run "echo 'type=83' | sfdisk /dev/vdb";
assert_script_run "mkfs.ext4 /dev/vdb1";
assert_script_run "echo '/dev/vdb1 /opt/update_repo ext4 defaults 1 2' >> /etc/fstab";
assert_script_run "mount /opt/update_repo";
}
assert_script_run "cd /opt/update_repo"; assert_script_run "cd /opt/update_repo";
assert_script_run "dnf -y install bodhi-client git createrepo koji", 300; assert_script_run "dnf -y install bodhi-client git createrepo koji", 300;
# download the packages # download the packages

2
templates-updates
View File

@ -1109,6 +1109,7 @@
{ key => "USER_LOGIN", value => "false" }, { key => "USER_LOGIN", value => "false" },
{ key => "ROOT_PASSWORD", value => "weakpassword" }, { key => "ROOT_PASSWORD", value => "weakpassword" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "NUMDISKS", value => "2" },
{ key => "HDD_1", value => "disk_f%VERSION%_minimal_3_%ARCH%.img" }, { key => "HDD_1", value => "disk_f%VERSION%_minimal_3_%ARCH%.img" },
], ],
}, },
@ -1121,6 +1122,7 @@
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "+DESKTOP", value => "" }, { key => "+DESKTOP", value => "" },
{ key => "+LIVE", value => "" }, { key => "+LIVE", value => "" },
{ key => "NUMDISKS", value => "2" },
{ key => "HDD_1", value => "disk_f%VERSION%_minimal_3_%ARCH%.img" }, { key => "HDD_1", value => "disk_f%VERSION%_minimal_3_%ARCH%.img" },
], ],
}, },