From 4d4b2d773959291e6d9d1a360f1715280ca8291a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?= Date: Thu, 28 May 2020 11:40:34 +0200 Subject: [PATCH] Finish the post review changes. --- check-needles.py | 3 +-- lib/anaconda.pm | 2 +- templates.fif.json | 18 ++++++++---------- ...ize.pm => disk_custom_blivet_resize_lvm.pm} | 0 ...tom_resize.pm => disk_custom_resize_lvm.pm} | 0 5 files changed, 10 insertions(+), 13 deletions(-) rename tests/{disk_custom_blivet_resize.pm => disk_custom_blivet_resize_lvm.pm} (100%) rename tests/{disk_custom_resize.pm => disk_custom_resize_lvm.pm} (100%) diff --git a/check-needles.py b/check-needles.py index 0f6db05d..6307fda4 100755 --- a/check-needles.py +++ b/check-needles.py @@ -78,9 +78,8 @@ for user in ("jack", "jim"): testliterals.append(f"user_confirm_{user}") # partitioning stuff, there's a bunch of this, all in anaconda.pm # multiple things use this -for part in ("swap", "root", "ext4", "efi", "boot"): +for part in ("swap", "root", "efi", "boot"): testliterals.append(f"anaconda_part_select_{part}") - testliterals.append(f"anaconda_blivet_part_select_{part}") testliterals.append(f"anaconda_blivet_part_inactive_{part}") # select_disks for num in range(1, 10): diff --git a/lib/anaconda.pm b/lib/anaconda.pm index 46ba41cc..1e9f2eb5 100644 --- a/lib/anaconda.pm +++ b/lib/anaconda.pm @@ -178,7 +178,7 @@ sub custom_blivet_format_partition { # This subroutine formats a selected partition. To use it, you must select the # partition by other means before you format it using this routine. # You have to create a needle for any non-existing filesystem that is - # passed via the $type, such as anaconda_blivet_part_select_ext4. + # passed via the $type, such as anaconda_blivet_part_fs_ext4. my %args = @_; # Start editing the partition and select the Format option assert_and_click "anaconda_blivet_part_edit"; diff --git a/templates.fif.json b/templates.fif.json index 960ce115..6607cc54 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -260,7 +260,7 @@ "flavor": "Workstation-live-iso", "settings": { "DESKTOP": "gnome", - "HDDSIZEGB": "13", + "HDDSIZEGB": "20", "LIVE": "1", "PACKAGE_SET": "default", "TEST_TARGET": "ISO" @@ -623,28 +623,26 @@ "START_AFTER_TEST": "install_default_upload" } }, - "install_blivet_resize": { + "install_blivet_resize_lvm": { "profiles": { "fedora-Workstation-live-iso-x86_64-*-64bit": 30, - "fedora-Workstation-live-iso-x86_64-*-uefi": 30, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30 }, "settings": { - "PARTITIONING": "custom_blivet_resize", + "PARTITIONING": "custom_blivet_resize_lvm", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "INSTALL": "1" } }, - "install_resize": { + "install_resize_lvm": { "profiles": { "fedora-Workstation-live-iso-x86_64-*-64bit": 30, - "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30, "fedora-Workstation-live-iso-x86_64-*-uefi": 30 }, "settings": { - "PARTITIONING": "custom_resize", + "PARTITIONING": "custom_resize_lvm", "START_AFTER_TEST": "install_default_upload", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "INSTALL": "1", @@ -915,7 +913,8 @@ "fedora-Server-boot-iso-x86_64-*-64bit": 10, "fedora-Server-boot-iso-x86_64-*-uefi": 11, "fedora-Server-dvd-iso-x86_64-*-uefi": 11, - "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 51 + "fedora-Silverblue-dvd_ostree-iso-x86_64-*-uefi": 51, + "fedora-Workstation-live-iso-x86_64-*-uefi": 11 }, "settings": { "PACKAGE_SET": "default", @@ -933,8 +932,7 @@ "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 10, - "fedora-Workstation-live-iso-x86_64-*-64bit": 10, - "fedora-Workstation-live-iso-x86_64-*-uefi": 10 + "fedora-Workstation-live-iso-x86_64-*-64bit": 10 }, "settings": { "PACKAGE_SET": "default", diff --git a/tests/disk_custom_blivet_resize.pm b/tests/disk_custom_blivet_resize_lvm.pm similarity index 100% rename from tests/disk_custom_blivet_resize.pm rename to tests/disk_custom_blivet_resize_lvm.pm diff --git a/tests/disk_custom_resize.pm b/tests/disk_custom_resize_lvm.pm similarity index 100% rename from tests/disk_custom_resize.pm rename to tests/disk_custom_resize_lvm.pm