From b4f3e6ea5aad1a506d63536d1d754f81bd661d49 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 29 Apr 2021 16:07:19 -0700 Subject: [PATCH] Move install_blivet_resize_lvm, fix install_resize_lvm (#201) This is the same thing we did for install_resize_lvm, to address issue #201. We just didn't get around to doing it for the blivet test yet. We also change the HDDSIZEGB for the parent test to 15GB so the resizing stuff actually works in both resize tests; ever since we changed this the install_resize_lvm test has not been working properly, it hasn't actually been doing any resize. Also drop the swap partition stuff from that test as it's for sure no longer needed. Signed-off-by: Adam Williamson --- templates.fif.json | 12 +++++++----- tests/disk_custom_resize_lvm.pm | 7 ------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/templates.fif.json b/templates.fif.json index 9103a447..a7f56c50 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -705,15 +705,16 @@ }, "install_blivet_resize_lvm": { "profiles": { - "fedora-universal-aarch64-*-aarch64": 20, - "fedora-universal-ppc64le-*-ppc64le": 20, - "fedora-universal-x86_64-*-64bit": 20 + "fedora-Server-dvd-iso-aarch64-*-aarch64": 40, + "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40, + "fedora-Server-dvd-iso-x86_64-*-64bit": 40 }, "settings": { "PARTITIONING": "custom_blivet_resize_lvm", - "HDD_1": "disk_f%PREVREL%_desktop_4_%ARCH%.img", + "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", + "INSTALL": "1", "ROOT_PASSWORD": "weakpassword", - "INSTALL": "1" + "START_AFTER_TEST": "install_lvm_ext4" } }, "install_resize_lvm": { @@ -1274,6 +1275,7 @@ "fedora-Server-dvd-iso-x86_64-*-uefi": 41 }, "settings": { + "HDDSIZEGB": "15", "PARTITIONING": "custom_lvm_ext4", "ROOT_PASSWORD": "weakpassword", "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2" diff --git a/tests/disk_custom_resize_lvm.pm b/tests/disk_custom_resize_lvm.pm index 6cdfe9e4..a58e4d8a 100644 --- a/tests/disk_custom_resize_lvm.pm +++ b/tests/disk_custom_resize_lvm.pm @@ -74,13 +74,6 @@ sub run { send_key "tab"; assert_and_click "anaconda_part_add_mountpoint"; - # Then mount the Swap partition if it is present. - if (check_screen "anaconda_part_select_swap") { - assert_and_click "anaconda_part_select_swap"; - assert_and_click "anaconda_part_device_reformat"; - assert_and_click "anaconda_part_update_settings"; - } - # Close the spoke. assert_and_click "anaconda_spoke_done";