From 54f69463b0ce6a75167859caaa81b26081c710cd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 28 Feb 2024 14:49:35 -0800
Subject: [PATCH] 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>
---
 templates-updates.fif.json | 4 ++++
 tests/_console_shutdown.pm | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 345e76cd..0fe143ac 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -61,6 +61,7 @@
             "flavor": "updates-server",
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
+                "NUMDISKS": "2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -71,6 +72,7 @@
             "flavor": "updates-server",
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
+                "NUMDISKS": "2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -112,6 +114,7 @@
             "flavor": "updates-server",
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
+                "NUMDISKS": "2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -125,6 +128,7 @@
                 "DESKTOP": "gnome",
                 "DEPLOY_UPLOAD_TEST": "install_default_update_ostree",
                 "HDDSIZEGB": "15",
+                "NUMDISKS": "2",
                 "PACKAGE_SET": "default",
                 "RETRY": "1",
                 "SUBVARIANT": "Silverblue"
diff --git a/tests/_console_shutdown.pm b/tests/_console_shutdown.pm
index 38d0cc6b..c2dc3fc3 100644
--- a/tests/_console_shutdown.pm
+++ b/tests/_console_shutdown.pm
@@ -15,6 +15,10 @@ sub run {
     # 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
     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);
     assert_shutdown 180;
 }