diff --git a/lib/anaconda.pm b/lib/anaconda.pm index 8840a136..5740d34d 100644 --- a/lib/anaconda.pm +++ b/lib/anaconda.pm @@ -9,7 +9,7 @@ use testapi; use utils; use bugzilla; -our @EXPORT = qw/select_disks custom_scheme_select custom_blivet_add_partition custom_blivet_format_partition custom_blivet_resize_partition custom_change_type custom_change_fs custom_change_device custom_delete_part get_full_repo check_help_on_pane get_mirrorlist_url crash_anaconda_text report_bug_text/; +our @EXPORT = qw/select_disks custom_scheme_select custom_add_partition custom_blivet_add_partition custom_blivet_format_partition custom_blivet_resize_partition custom_change_type custom_change_fs custom_change_device custom_delete_part get_full_repo check_help_on_pane get_mirrorlist_url crash_anaconda_text report_bug_text/; sub select_disks { # Handles disk selection. Has one optional argument - number of @@ -175,8 +175,78 @@ sub custom_blivet_add_partition { } } +sub custom_add_partition { + # Used to add partition on Rocky custom-gui partitioning screen + # in Anaconda. Should be called when custom-gui is displayed and free space is selected. + # You can pass device type for partition (needle tagged anaconda_custom_devicetype_$devicetype should exist), size of that partition in MiBs, desired filesystem of that partition + # (anaconda_custom_part_fs_$filesystem should exist) and mountpoint of that partition (e. g. string "/boot"). + my %args = ( + devicetype => "", + raidlevel => 0, + size => 0, + filesystem => "", + mountpoint => "", + @_ + ); + $args{devicetype} = "raid" if $args{raidlevel}; + + # send tab until 'add' button is selected, then press + # the number of tabs needed seems to depend on whether a partition has already been added + send_key_until_needlematch("anaconda_custom_part_add", "tab"); + send_key "spc"; + + # supply the mountpoint + assert_screen "anaconda_custom_mountpoint"; + type_safely $args{mountpoint}; + send_key "tab"; + send_key "tab"; + send_key "tab"; + assert_screen "anaconda_custom_size"; + # supply the desired size + # if size is not provided, leave empty to use the remaining disk space + if ($args{size}) { + type_safely $args{size}; + } + send_key "tab"; + send_key "tab"; + assert_screen "anaconda_custom_btn_add_mountpoint"; + send_key "spc"; + + # if no devicetype was specified or devicetype is already selected, do nothing + if (($args{devicetype} && !check_screen("anaconda_custom_part_fs_$args{devicetype}_selected", 5))) { + # send 'tab' until the Device Type dropdown is selected + send_key_until_needlematch("anaconda_custom_part_devicetype_selected", "tab"); + send_key "spc"; + # send 'down' until the correct devicetype is selected + send_key_until_needlematch("anaconda_custom_part_devicetype_$args{devicetype}", "down"); + send_key "spc"; + } + # if no filesystem was specified or filesystem is already selected, do nothing + if ($args{filesystem} && !check_screen("anaconda_custom_part_fs_$args{filesystem}_selected", 5)) { + # send 'tab' until the File System dropdown is selected + send_key_until_needlematch("anaconda_custom_part_fs_selected", "tab"); + send_key "spc"; + # send 'down' until the correct filesystem is selected + send_key_until_needlematch("anaconda_custom_part_fs_$args{filesystem}_selected", "down"); + send_key "spc"; + } + if ($args{raidlevel}) { + # send 'tab' until Raid Level dropdown is selected + send_key_until_needlematch("anaconda_custom_part_raidlevel_selected", "tab"); + send_key "spc"; + #choose RAID level from dropdown + send_key_until_needlematch("anaconda_custom_part_raid_1_selected", "down"); + send_key "spc"; + } + + # select "free space" in custom-gui if it exists, so we could run this function again to add another partition + if (check_screen("anaconda_custom_free_space", 15)) { + assert_and_click "anaconda_custom_free_space"; + } +} + 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. # You have to create a needle for any non-existing filesystem that is # passed via the $type, such as anaconda_blivet_part_fs_ext4. @@ -202,14 +272,14 @@ sub custom_blivet_format_partition { sub custom_blivet_resize_partition { # This subroutine resizes the selected (active) partition to a given value. Note, that # if the selected value is bigger than the available space, it will only be - # resized to fill up the available space no matter the number. + # resized to fill up the available space no matter the number. # This routine cannot will not be able to select a particular partition!!! my %args = @_; # Start editing the partition and select the Resize option assert_and_click "anaconda_blivet_part_edit"; assert_and_click "anaconda_blivet_part_resize"; # Select the appropriate units. Note, that there must a be needle existing - # for each possible unit that you might want to use, such as + # for each possible unit that you might want to use, such as # "anaconda_blivet_size_unit_gib". assert_and_click "anaconda_blivet_part_drop_select"; assert_and_click "anaconda_blivet_size_unit_$args{units}"; @@ -365,7 +435,7 @@ sub crash_anaconda_text { # This routine uses the Anaconda crash trigger to break the ongoing Anaconda installation to simulate # an Anaconda crash and runs a series of steps that results in creating a bug in Bugzilla. # It is used in the `install_text.pm` test and can be switched on by using the CRASH_REPORT - # variable set to 1. + # variable set to 1. # # First let us navigate to reach the shell window in Anaconda using the alt-f3 combo, # this should take us to another terminal, where we can simulate the crash. @@ -395,7 +465,7 @@ sub report_bug_text { # a textual console. # We will not create a needle for every menu item, and we will fail, # if there will be no positive Bugzilla confirmation shown at the end - # of the process and then we will fail. + # of the process and then we will fail. # # Let us record the time of this test run. Later, we will use it to # limit the Bugzilla search. @@ -419,12 +489,12 @@ sub report_bug_text { type_password $password; type_string "\n"; sleep 10; - # Save the report without changing it. + # Save the report without changing it. # It would need some more tweaking to actually type into the report, but since # it is reported even if unchanged, we leave it as such. type_string ":wq\n"; # Wait until the Crash menu appears again. - # The same screen shows the result of the Bugzilla operation, + # The same screen shows the result of the Bugzilla operation, # so if the needle matches, the bug has been created in Bugzilla. # Bugzilla connection is slow so we need to wait out some time, # therefore let's use a cycle that will check each 10 seconds and @@ -435,7 +505,7 @@ sub report_bug_text { ++$counter; } # Sometimes, Bugzilla throws out a communication error although the bug has been - # created successfully. If this happens, we will softfail and leave the creation + # created successfully. If this happens, we will softfail and leave the creation # check to a later step. if ($counter > 12) { record_soft_failure "Warning: Bugzilla has reported an error which could mean that the bug has not been created correctly, but it probably is not a real problem, if the test has not failed completely. "; @@ -443,7 +513,7 @@ sub report_bug_text { # Now, let us check with Bugzilla directly, if the bug has been created. # First, we shall get a Bugzilla format timestamp to use it in the query. - # The timestamp will limit the list of bugs to those that have been created since + # The timestamp will limit the list of bugs to those that have been created since # the then -> resulting with high probability in the one that this test run # has just created. $timestamp = convert_to_bz_timestamp($timestamp); @@ -455,7 +525,7 @@ sub report_bug_text { else { print("BUGZILLA: The last bug was found: $lastbug\n"); } - # We have found that the bug indeed is in the bugzilla (otherwise + # We have found that the bug indeed is in the bugzilla (otherwise # we would have died already) so now we close it to clean up after this test run. my $result = close_notabug($lastbug, $apikey); unless ($result) { @@ -467,5 +537,5 @@ sub report_bug_text { # Quit anaconda type_string "4\n"; - + } diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.json new file mode 100644 index 00000000..7a909929 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 548, + "ypos": 463, + "width": 109, + "height": 20, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_btn_add_mountpoint" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.png new file mode 100644 index 00000000..25058b34 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_btn_add_mountpoint-20211005.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.json new file mode 100644 index 00000000..5f52ed1b --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 352, + "ypos": 355, + "width": 317, + "height": 46, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_mountpoint" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.png new file mode 100644 index 00000000..206604f6 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211005.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.json new file mode 100644 index 00000000..169aaf07 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.json @@ -0,0 +1,21 @@ +{ + "area": [ + { + "width": 131, + "type": "match", + "xpos": 352, + "ypos": 367, + "height": 22, + "click_point": { + "xpos": 131, + "ypos": 12 + } + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_mountpoint" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.png new file mode 100644 index 00000000..1b63dd66 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_mountpoint-20211007.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.json new file mode 100644 index 00000000..aee77f1a --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 33, + "ypos": 617, + "width": 38, + "height": 34, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_add" + ] +} diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.png new file mode 100644 index 00000000..d6ea066f Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json new file mode 100644 index 00000000..6d75f1f3 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json @@ -0,0 +1,21 @@ +{ + "area": [ + { + "height": 34, + "ypos": 263, + "type": "match", + "width": 168, + "xpos": 497, + "click_point": { + "xpos": 118, + "ypos": 34 + } + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_devicetype" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.png new file mode 100644 index 00000000..e09c6fa7 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.json new file mode 100644 index 00000000..b1fa9c96 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 509, + "ypos": 300, + "width": 48, + "height": 13, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_devicetype_lvmlv" + ] +} diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.png new file mode 100644 index 00000000..32dde2c5 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_raid-20211012T.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_raid-20211012T.json new file mode 100644 index 00000000..a2bd8667 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_raid-20211012T.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 511, + "ypos": 330, + "width": 33, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_devicetype_raid" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_raid-20211012T.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_raid-20211012T.png new file mode 100644 index 00000000..6c9622dc Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_raid-20211012T.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.json new file mode 100644 index 00000000..0ab95f7c --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 503, + "ypos": 269, + "width": 76, + "height": 27, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_devicetype_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.png new file mode 100644 index 00000000..9317a03a Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_standard_partition-20211011.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_standard_partition-20211011.json new file mode 100644 index 00000000..eab13ecb --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_standard_partition-20211011.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 510, + "ypos": 300, + "width": 112, + "height": 14, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_devicetype_standard_partition" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_standard_partition-20211011.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_standard_partition-20211011.png new file mode 100644 index 00000000..7c90b757 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_standard_partition-20211011.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.json new file mode 100644 index 00000000..8c7a58c5 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 507, + "ypos": 359, + "width": 120, + "height": 15, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_fs_efi_filesystem_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.png new file mode 100644 index 00000000..9e8cab1a Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4_selected-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4_selected-20211010.json new file mode 100644 index 00000000..68890ca6 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4_selected-20211010.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 509, + "ypos": 275, + "width": 36, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_fs_ext4_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4_selected-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4_selected-20211010.png new file mode 100644 index 00000000..fe8aa594 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4_selected-20211010.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.json new file mode 100644 index 00000000..979f6f5a --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "height": 26, + "type": "match", + "ypos": 351, + "width": 71, + "xpos": 504 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_fs_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.png new file mode 100644 index 00000000..89e53d88 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap_selected-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap_selected-20211010.json new file mode 100644 index 00000000..665b7d74 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap_selected-20211010.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 506, + "ypos": 364, + "width": 45, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_fs_swap_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap_selected-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap_selected-20211010.png new file mode 100644 index 00000000..c361e3d7 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap_selected-20211010.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_1_selected-20211021.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_1_selected-20211021.json new file mode 100644 index 00000000..69a1ade0 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_1_selected-20211021.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 779, + "ypos": 304, + "width": 40, + "height": 14, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_raid_1_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_1_selected-20211021.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_1_selected-20211021.png new file mode 100644 index 00000000..8dafb7e4 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_1_selected-20211021.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_4_selected-20211021.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_4_selected-20211021.json new file mode 100644 index 00000000..cd405ad3 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_4_selected-20211021.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 775, + "ypos": 335, + "width": 45, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_raid_4_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_4_selected-20211021.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_4_selected-20211021.png new file mode 100644 index 00000000..76bb1351 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raid_4_selected-20211021.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raidlevel_selected-20211021.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raidlevel_selected-20211021.json new file mode 100644 index 00000000..c84a9c72 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raidlevel_selected-20211021.json @@ -0,0 +1,18 @@ +{ + "area": [ + { + "height": 26, + "width": 66, + "xpos": 773, + "type": "match", + "ypos": 276, + "match": 98 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_raidlevel_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raidlevel_selected-20211021.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raidlevel_selected-20211021.png new file mode 100644 index 00000000..1bf06b55 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_raidlevel_selected-20211021.png differ diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.json new file mode 100644 index 00000000..7a565e11 --- /dev/null +++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.json @@ -0,0 +1,21 @@ +{ + "area": [ + { + "ypos": 404, + "type": "match", + "xpos": 352, + "width": 112, + "height": 24, + "click_point": { + "xpos": 134, + "ypos": 10 + } + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_size" + ] +} \ No newline at end of file diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.png new file mode 100644 index 00000000..70d69840 Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.png differ diff --git a/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.json b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.json new file mode 100644 index 00000000..ff8f9622 --- /dev/null +++ b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 506, + "ypos": 361, + "width": 32, + "height": 14, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "anaconda_custom_part_fs_xfs_selected" + ] +} \ No newline at end of file diff --git a/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.png b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.png new file mode 100644 index 00000000..5c31ecd5 Binary files /dev/null and b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.png differ diff --git a/templates.fif.json b/templates.fif.json index 80fd10e2..6d9489dd 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -120,7 +120,7 @@ "TEST_TARGET": "ISO" }, "version": "*" - }, + }, "rocky-package-set-x86_64-*": { "arch": "x86_64", "distri": "rocky", @@ -138,7 +138,7 @@ "TEST_TARGET": "ISO" }, "version": "*" - }, + }, "rocky-universal-x86_64-*": { "arch": "x86_64", "distri": "rocky", @@ -185,7 +185,7 @@ "rocky-package-set-aarch64-*-aarch64": { "machine": "aarch64", "product": "rocky-package-set-aarch64-*" - }, + }, "rocky-package-set-x86_64-*-64bit": { "machine": "64bit", "product": "rocky-package-set-x86_64-*" @@ -197,7 +197,7 @@ "rocky-universal-aarch64-*-aarch64": { "machine": "aarch64", "product": "rocky-universal-aarch64-*" - }, + }, "rocky-universal-x86_64-*-64bit": { "machine": "64bit", "product": "rocky-universal-x86_64-*" @@ -316,20 +316,6 @@ "USER_LOGIN": "false" } }, - "install_blivet_resize_lvm": { - "profiles": { - "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-64bit": 40 - }, - "settings": { - "PARTITIONING": "custom_blivet_resize_lvm", - "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", - "INSTALL": "1", - "POSTINSTALL": "disk_custom_resize_lvm_postinstall", - "ROOT_PASSWORD": "weakpassword", - "START_AFTER_TEST": "install_lvm_ext4" - } - }, "install_resize_lvm": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, @@ -390,54 +376,30 @@ "USER_LOGIN": "qwerty" } }, - "install_blivet_lvmthin": { - "profiles": { - "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-64bit": 40, - "rocky-universal-x86_64-*-uefi": 41 - }, - "settings": { - "PARTITIONING": "custom_blivet_lvmthin", - "POSTINSTALL": "disk_custom_lvmthin_postinstall", - "ROOT_PASSWORD": "weakpassword" - } - }, - "install_blivet_lvm_ext4": { + "install_custom_gui_lvm_ext4": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40, "rocky-dvd-iso-x86_64-*-uefi": 41 }, "settings": { - "PARTITIONING": "custom_blivet_lvm_ext4", + "PARTITIONING": "custom_gui_lvm_ext4", "POSTINSTALL": "disk_custom_lvm_ext4_postinstall", "ROOT_PASSWORD": "weakpassword" } }, - "install_blivet_standard_partition_ext4": { + "install_custom_gui_standard_partition_ext4": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, "rocky-dvd-iso-x86_64-*-64bit": 40, "rocky-dvd-iso-x86_64-*-uefi": 41 }, "settings": { - "PARTITIONING": "custom_blivet_standard_partition_ext4", + "PARTITIONING": "custom_gui_standard_partition_ext4", "ROOT_PASSWORD": "weakpassword" } }, - "install_blivet_with_swap": { - "profiles": { - "rocky-universal-aarch64-*-aarch64": 50, - "rocky-universal-x86_64-*-64bit": 50, - "rocky-universal-x86_64-*-uefi": 51 - }, - "settings": { - "PARTITIONING": "custom_blivet_with_swap", - "POSTINSTALL": "disk_custom_with_swap_postinstall", - "ROOT_PASSWORD": "weakpassword" - } - }, - "install_blivet_software_raid": { + "install_custom_gui_software_raid": { "profiles": { "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40, @@ -445,19 +407,19 @@ }, "settings": { "NUMDISKS": "2", - "PARTITIONING": "custom_blivet_software_raid", + "PARTITIONING": "custom_gui_software_raid", "POSTINSTALL": "disk_custom_software_raid_postinstall", "ROOT_PASSWORD": "weakpassword" } }, - "install_blivet_xfs": { + "install_custom_gui_xfs": { "profiles": { "rocky-universal-aarch64-*-aarch64": 40, "rocky-universal-x86_64-*-64bit": 40, "rocky-universal-x86_64-*-uefi": 41 }, "settings": { - "PARTITIONING": "custom_blivet_xfs", + "PARTITIONING": "custom_gui_xfs", "POSTINSTALL": "disk_custom_xfs_postinstall", "ROOT_PASSWORD": "weakpassword" } diff --git a/tests/disk_custom_gui_lvm_ext4.pm b/tests/disk_custom_gui_lvm_ext4.pm new file mode 100644 index 00000000..5c2cf73f --- /dev/null +++ b/tests/disk_custom_gui_lvm_ext4.pm @@ -0,0 +1,43 @@ +use base "anacondatest"; +use strict; +use testapi; +use anaconda; + +sub run { + my $self = shift; + # Go to INSTALLATION DESTINATION and ensure the disk is selected. + # Because PARTITIONING starts with 'custom_', this will select custom. + select_disks(); + assert_and_click "anaconda_spoke_done"; + + if (get_var("UEFI")) { + # if we're running on UEFI, we need esp + custom_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem'); + } + if (get_var("OFW")) { + custom_add_partition(size => 4, filesystem => 'ppc_prep_boot'); + } + + custom_add_partition(size => 512, mountpoint => '/boot', filesystem => 'ext4'); + custom_add_partition(size => 512, mountpoint => 'swap', filesystem => 'swap'); + + # LVM vg already exists, so just add a volume + # add lvm LV with ext4 and mount it as / + custom_add_partition(devicetype => 'lvmlv', filesystem => 'ext4', mountpoint => '/'); + + # Confirm changes + assert_and_click "anaconda_spoke_done"; + assert_and_click "anaconda_part_accept_changes"; + + # Anaconda hub + assert_screen "anaconda_main_hub", 300; # + +} + +sub test_flags { + return { fatal => 1 }; +} + +1; + +# vim: set sw=4 et: diff --git a/tests/disk_custom_gui_software_raid.pm b/tests/disk_custom_gui_software_raid.pm new file mode 100644 index 00000000..79870d25 --- /dev/null +++ b/tests/disk_custom_gui_software_raid.pm @@ -0,0 +1,39 @@ +use base "anacondatest"; +use strict; +use testapi; +use anaconda; + +sub run { + my $self = shift; + # Go to INSTALLATION DESTINATION and ensure two disks are selected. + # Because PARTITIONING starts with 'custom', this will select blivet-gui. + select_disks(disks=>2); + assert_and_click "anaconda_spoke_done"; + + if (get_var("UEFI")) { + # if we're running on UEFI, we need esp + custom_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem'); + } + if (get_var("OFW")) { + custom_add_partition(size => 4, filesystem => 'ppc_prep_boot'); + } + + custom_add_partition(size => 512, mountpoint => '/boot'); + custom_add_partition(filesystem => 'swap', size => 512, mountpoint => 'swap'); + custom_add_partition(raidlevel => 1, mountpoint => '/'); + + assert_and_click "anaconda_spoke_done"; + assert_and_click "anaconda_part_accept_changes"; + + # Anaconda hub + assert_screen "anaconda_main_hub", 300; # + +} + +sub test_flags { + return { fatal => 1 }; +} + +1; + +# vim: set sw=4 et: diff --git a/tests/disk_custom_gui_standard_partition_ext4.pm b/tests/disk_custom_gui_standard_partition_ext4.pm new file mode 100644 index 00000000..74f27929 --- /dev/null +++ b/tests/disk_custom_gui_standard_partition_ext4.pm @@ -0,0 +1,40 @@ +use base "anacondatest"; +use strict; +use testapi; +use anaconda; + +sub run { + my $self = shift; + # Go to INSTALLATION DESTINATION and ensure the disk is selected. + # Because PARTITIONING starts with 'custom', this will select custom-gui. + select_disks(); + assert_and_click "anaconda_spoke_done"; + + if (get_var("UEFI")) { + # if we're running on UEFI, we need esp + custom_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem'); + } + if (get_var("OFW")) { + custom_add_partition(size => 4, filesystem => 'ppc_prep_boot'); + } + + #custom_add_partition(filesystem => 'ext4', mountpoint => '/'); + custom_add_partition(filesystem => 'ext4', size => 512, mountpoint => '/boot', devicetype => 'standard_partition'); + custom_add_partition(filesystem => 'swap', size => 512, mountpoint => 'swap'); + custom_add_partition(filesystem => 'ext4', mountpoint => '/', devicetype => 'standard_partition'); + + assert_and_click "anaconda_spoke_done"; + assert_and_click "anaconda_part_accept_changes"; + + # Anaconda hub + assert_screen "anaconda_main_hub", 300; # + +} + +sub test_flags { + return { fatal => 1 }; +} + +1; + +# vim: set sw=4 et: diff --git a/tests/disk_custom_gui_xfs.pm b/tests/disk_custom_gui_xfs.pm new file mode 100644 index 00000000..9d5351e7 --- /dev/null +++ b/tests/disk_custom_gui_xfs.pm @@ -0,0 +1,39 @@ +use base "anacondatest"; +use strict; +use testapi; +use anaconda; + +sub run { + my $self = shift; + # Go to INSTALLATION DESTINATION and ensure the disk is selected. + # Because PARTITIONING starts with 'custom', this will select custom-gui. + select_disks(); + assert_and_click "anaconda_spoke_done"; + + if (get_var("UEFI")) { + # if we're running on UEFI, we need esp + custom_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem'); + } + if (get_var("OFW")) { + custom_add_partition(size => 4, filesystem => 'ppc_prep_boot'); + } + + custom_add_partition(filesystem => 'xfs', size => 512, mountpoint => '/boot'); + custom_add_partition(filesystem => 'swap', size => 512, mountpoint => 'swap'); + custom_add_partition(filesystem => 'xfs', mountpoint => '/'); + + assert_and_click "anaconda_spoke_done"; + assert_and_click "anaconda_part_accept_changes"; + + # Anaconda hub + assert_screen "anaconda_main_hub", 300; # + +} + +sub test_flags { + return { fatal => 1 }; +} + +1; + +# vim: set sw=4 et: