mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-21 21:43:08 +00:00
Use NUMDISKS=2 (or higher) on all update flavors
We stopped doing this on Server because it caused problems with tests that use a disk image uploaded by another test, e.g. the cockpit tests - they use the `/etc/fstab` from the disk image the parent test uploaded, which says to mount the second disk as /mnt/update_repo, but since this is a new test it has a fresh, empty second disk with no filesystems to mount. This tries to fix that by making _console_shutdown.pm edit that line back out of /etc/fstab, so we can set NUMDISKS=2 again (also on the ostree flavor, which had a similar problem with the overlay and rebase tests using a disk image uploaded by the install test). We need to fix this because FEDORA-2024-9b9da603e1 is so big it causes the tests that don't use a scratch disk to run out of disk space. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
ec11ce7903
commit
54f69463b0
@ -61,6 +61,7 @@
|
|||||||
"flavor": "updates-server",
|
"flavor": "updates-server",
|
||||||
"settings": {
|
"settings": {
|
||||||
"+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
|
"+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
|
||||||
|
"NUMDISKS": "2",
|
||||||
"RETRY": "1"
|
"RETRY": "1"
|
||||||
},
|
},
|
||||||
"version": "*"
|
"version": "*"
|
||||||
@ -71,6 +72,7 @@
|
|||||||
"flavor": "updates-server",
|
"flavor": "updates-server",
|
||||||
"settings": {
|
"settings": {
|
||||||
"+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
|
"+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
|
||||||
|
"NUMDISKS": "2",
|
||||||
"RETRY": "1"
|
"RETRY": "1"
|
||||||
},
|
},
|
||||||
"version": "*"
|
"version": "*"
|
||||||
@ -112,6 +114,7 @@
|
|||||||
"flavor": "updates-server",
|
"flavor": "updates-server",
|
||||||
"settings": {
|
"settings": {
|
||||||
"+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
|
"+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
|
||||||
|
"NUMDISKS": "2",
|
||||||
"RETRY": "1"
|
"RETRY": "1"
|
||||||
},
|
},
|
||||||
"version": "*"
|
"version": "*"
|
||||||
@ -125,6 +128,7 @@
|
|||||||
"DESKTOP": "gnome",
|
"DESKTOP": "gnome",
|
||||||
"DEPLOY_UPLOAD_TEST": "install_default_update_ostree",
|
"DEPLOY_UPLOAD_TEST": "install_default_update_ostree",
|
||||||
"HDDSIZEGB": "15",
|
"HDDSIZEGB": "15",
|
||||||
|
"NUMDISKS": "2",
|
||||||
"PACKAGE_SET": "default",
|
"PACKAGE_SET": "default",
|
||||||
"RETRY": "1",
|
"RETRY": "1",
|
||||||
"SUBVARIANT": "Silverblue"
|
"SUBVARIANT": "Silverblue"
|
||||||
|
@ -15,6 +15,10 @@ sub run {
|
|||||||
# tests that need to edit boot params will see it. Don't use
|
# tests that need to edit boot params will see it. Don't use
|
||||||
# assert_script_run as this will fail when it's not set
|
# assert_script_run as this will fail when it's not set
|
||||||
script_run("grub2-editenv - unset menu_auto_hide", 0);
|
script_run("grub2-editenv - unset menu_auto_hide", 0);
|
||||||
|
# drop the update_repo mount definition on update tests, as
|
||||||
|
# child tests won't have the same disk image attached as HDD_2
|
||||||
|
# so won't have this there to mount
|
||||||
|
script_run("sed -i '/update_repo/d' /etc/fstab") if (get_var("ADVISORY_OR_TASK"));
|
||||||
script_run("poweroff", 0);
|
script_run("poweroff", 0);
|
||||||
assert_shutdown 180;
|
assert_shutdown 180;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user