testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-22 13:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish the post review changes.

Browse Source
This commit is contained in:
Lukáš Růžička 2020-05-28 11:40:34 +02:00 committed by Adam Williamson
parent b5169e602b
commit 4d4b2d7739
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
check-needles.py
View File

@ -78,9 +78,8 @@ for user in ("jack", "jim"):
testliterals.append(f"user_confirm_{user}") testliterals.append(f"user_confirm_{user}")
# partitioning stuff, there's a bunch of this, all in anaconda.pm # partitioning stuff, there's a bunch of this, all in anaconda.pm
# multiple things use this # 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_part_select_{part}")
testliterals.append(f"anaconda_blivet_part_select_{part}")
testliterals.append(f"anaconda_blivet_part_inactive_{part}") testliterals.append(f"anaconda_blivet_part_inactive_{part}")
# select_disks # select_disks
for num in range(1, 10): for num in range(1, 10):

2
lib/anaconda.pm
View File

@ -178,7 +178,7 @@ sub custom_blivet_format_partition {
# This subroutine formats a selected partition. To use it, you must select the # This subroutine formats a selected partition. To use it, you must select the
# partition by other means before you format it using this routine. # partition by other means before you format it using this routine.
# You have to create a needle for any non-existing filesystem that is # 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 = @_; my %args = @_;
# Start editing the partition and select the Format option # Start editing the partition and select the Format option
assert_and_click "anaconda_blivet_part_edit"; assert_and_click "anaconda_blivet_part_edit";

18
templates.fif.json
View File

@ -260,7 +260,7 @@
"flavor": "Workstation-live-iso", "flavor": "Workstation-live-iso",
"settings": { "settings": {
"DESKTOP": "gnome", "DESKTOP": "gnome",
"HDDSIZEGB": "13", "HDDSIZEGB": "20",
"LIVE": "1", "LIVE": "1",
"PACKAGE_SET": "default", "PACKAGE_SET": "default",
"TEST_TARGET": "ISO" "TEST_TARGET": "ISO"
@ -623,28 +623,26 @@
"START_AFTER_TEST": "install_default_upload" "START_AFTER_TEST": "install_default_upload"
} }
}, },
"install_blivet_resize": { "install_blivet_resize_lvm": {
"profiles": { "profiles": {
"fedora-Workstation-live-iso-x86_64-*-64bit": 30, "fedora-Workstation-live-iso-x86_64-*-64bit": 30,
"fedora-Workstation-live-iso-x86_64-*-uefi": 30,
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30 "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30
}, },
"settings": { "settings": {
"PARTITIONING": "custom_blivet_resize", "PARTITIONING": "custom_blivet_resize_lvm",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"START_AFTER_TEST": "install_default_upload", "START_AFTER_TEST": "install_default_upload",
"INSTALL": "1" "INSTALL": "1"
} }
}, },
"install_resize": { "install_resize_lvm": {
"profiles": { "profiles": {
"fedora-Workstation-live-iso-x86_64-*-64bit": 30, "fedora-Workstation-live-iso-x86_64-*-64bit": 30,
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30,
"fedora-Workstation-live-iso-x86_64-*-uefi": 30 "fedora-Workstation-live-iso-x86_64-*-uefi": 30
}, },
"settings": { "settings": {
"PARTITIONING": "custom_resize", "PARTITIONING": "custom_resize_lvm",
"START_AFTER_TEST": "install_default_upload", "START_AFTER_TEST": "install_default_upload",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"INSTALL": "1", "INSTALL": "1",
@ -915,7 +913,8 @@
"fedora-Server-boot-iso-x86_64-*-64bit": 10, "fedora-Server-boot-iso-x86_64-*-64bit": 10,
"fedora-Server-boot-iso-x86_64-*-uefi": 11, "fedora-Server-boot-iso-x86_64-*-uefi": 11,
"fedora-Server-dvd-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": { "settings": {
"PACKAGE_SET": "default", "PACKAGE_SET": "default",
@ -933,8 +932,7 @@
"fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
"fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 10, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 10,
"fedora-Workstation-live-iso-x86_64-*-64bit": 10, "fedora-Workstation-live-iso-x86_64-*-64bit": 10
"fedora-Workstation-live-iso-x86_64-*-uefi": 10
}, },
"settings": { "settings": {
"PACKAGE_SET": "default", "PACKAGE_SET": "default",

0
tests/disk_custom_blivet_resize.pm → tests/disk_custom_blivet_resize_lvm.pm
View File

0
tests/disk_custom_resize.pm → tests/disk_custom_resize_lvm.pm
View File