diff --git a/main.pm b/main.pm index 2a5a7ad7..145ed3fc 100644 --- a/main.pm +++ b/main.pm @@ -19,32 +19,43 @@ use testapi; use autotest; # Boot to anaconda Hub in English -autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm"; -unless (get_var("KICKSTART")) +if (get_var("ENTRYPOINT")) { - ## Disk partitioning - if (get_var('DISK_GUIDED_EMPTY')){ - autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm"; - } - elsif (get_var('DISK_GUIDED_MULTI')){ - autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi.pm"; - } - elsif (get_var('DISK_GUIDED_DELETE_ALL')){ - autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_delete_all.pm"; + autotest::loadtest get_var('CASEDIR')."/tests/".get_var("ENTRYPOINT").".pm"; +} +else +{ + autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm"; + + unless (get_var("KICKSTART")) + { + ## Disk partitioning + if (get_var('DISK_GUIDED_EMPTY')){ + autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm"; + } + elsif (get_var('DISK_GUIDED_MULTI')){ + autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi.pm"; + } + elsif (get_var('DISK_GUIDED_DELETE_ALL')){ + autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_delete_all.pm"; + } + + # Start installation, set user & root passwords, reboot + autotest::loadtest get_var('CASEDIR')."/tests/_do_install_and_reboot.pm"; } - # Start installation, set user & root passwords, reboot - autotest::loadtest get_var('CASEDIR')."/tests/_do_install_and_reboot.pm"; + # Wait for the login screen + autotest::loadtest get_var('CASEDIR')."/tests/_wait_for_login_screen.pm"; + + if (get_var('DISK_GUIDED_MULTI')) + { + autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi_postinstall.pm"; + } } -# Wait for the login screen -autotest::loadtest get_var('CASEDIR')."/tests/_wait_for_login_screen.pm"; -if (get_var('DISK_GUIDED_MULTI')) -{ - autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi_postinstall.pm"; -} + 1; # vim: set sw=4 et: diff --git a/needles/anaconda_install_finish.json b/needles/anaconda_install_finish.json index 7e8a0cf7..e61c0767 100644 --- a/needles/anaconda_install_finish.json +++ b/needles/anaconda_install_finish.json @@ -1,17 +1,17 @@ { - "tags": [ - "ENV-DESKTOP-default", - "ENV-DISTRI-fedora", - "ENV-INSTLANG-en_US", - "anaconda_install_finish" - ], "area": [ { - "xpos": 905, - "ypos": 679, - "width": 96, - "height": 48, - "type": "match" + "type": "match", + "width": 76, + "xpos": 941, + "ypos": 686, + "height": 33 } + ], + "tags": [ + "anaconda_install_finish", + "ENV-DISTRI-fedora", + "ENV-INSTLANG-en_US", + "ENV-FLAVOR-server" ] } \ No newline at end of file diff --git a/needles/anaconda_install_finish.png b/needles/anaconda_install_finish.png index a6fc07e9..4e2ea177 100644 Binary files a/needles/anaconda_install_finish.png and b/needles/anaconda_install_finish.png differ diff --git a/needles/anaconda_main_hub_server.json b/needles/anaconda_main_hub_server.json index 52dbfaad..d9d1d2ee 100644 --- a/needles/anaconda_main_hub_server.json +++ b/needles/anaconda_main_hub_server.json @@ -1,52 +1,59 @@ { - "area": [ - { - "xpos": 168, - "ypos": 7, - "width": 227, - "height": 57, - "type": "match" - }, - { - "xpos": 294, - "ypos": 139, - "width": 123, - "height": 31, - "type": "match" - }, - { - "xpos": 693, - "ypos": 135, - "width": 101, - "height": 33, - "type": "match" - }, - { - "xpos": 299, - "ypos": 207, - "width": 180, - "height": 33, - "type": "match" - }, - { - "xpos": 297, - "ypos": 328, - "width": 203, - "height": 38, - "type": "match" - }, - { - "xpos": 294, - "ypos": 443, - "width": 252, - "height": 40, - "type": "match" - } - ], "tags": [ "anaconda_main_hub", - "ENV-DESKTOP-default", "ENV-DISTRI-fedora", - "ENV-INSTLANG-en_US" + "ENV-INSTLANG-en_US", + "ENV-FLAVOR-server" + ], + "area": [ + { + "width": 227, + "height": 57, + "xpos": 168, + "ypos": 7, + "type": "match" + }, + { + "height": 33, + "ypos": 153, + "xpos": 266, + "width": 101, + "type": "match" + }, + { + "width": 180, + "height": 33, + "xpos": 699, + "ypos": 155, + "type": "match" + }, + { + "width": 203, + "height": 38, + "ypos": 346, + "xpos": 267, + "type": "match" + }, + { + "type": "match", + "height": 40, + "ypos": 461, + "xpos": 264, + "width": 252 + }, + { + "height": 18, + "ypos": 236, + "xpos": 272, + "width": 36, + "type": "match" + }, + { + "type": "match", + "height": 13, + "ypos": 240, + "xpos": 330, + "width": 40 + } ] -} +} \ No newline at end of file diff --git a/needles/anaconda_main_hub_server.png b/needles/anaconda_main_hub_server.png index 46e28a3b..9a9f2b84 100644 Binary files a/needles/anaconda_main_hub_server.png and b/needles/anaconda_main_hub_server.png differ diff --git a/needles/anaconda_select_install_lang.json b/needles/anaconda_select_install_lang.json index 50916626..88ffa469 100644 --- a/needles/anaconda_select_install_lang.json +++ b/needles/anaconda_select_install_lang.json @@ -1,17 +1,17 @@ { - "area": [ - { - "xpos": 333, - "ypos": 80, - "width": 180, - "height": 47, - "type": "match" - } - ], "tags": [ "anaconda_select_install_lang", - "ENV-DESKTOP-default", "ENV-DISTRI-fedora", - "ENV-INSTLANG-en_US" + "ENV-INSTLANG-en_US", + "ENV-FLAVOR-server" + ], + "area": [ + { + "height": 28, + "ypos": 110, + "xpos": 332, + "width": 88, + "type": "match" + } ] } \ No newline at end of file diff --git a/needles/anaconda_select_install_lang.png b/needles/anaconda_select_install_lang.png index 25eed94e..e87abfc8 100644 Binary files a/needles/anaconda_select_install_lang.png and b/needles/anaconda_select_install_lang.png differ diff --git a/needles/anaconda_select_install_lang_english_filtered.json b/needles/anaconda_select_install_lang_english_filtered.json index 25d82582..696e51a4 100644 --- a/needles/anaconda_select_install_lang_english_filtered.json +++ b/needles/anaconda_select_install_lang_english_filtered.json @@ -2,9 +2,9 @@ "area": [ { "xpos": 203, - "ypos": 170, - "width": 389, + "ypos": 188, "height": 100, + "width": 349, "type": "match" } ], diff --git a/needles/anaconda_select_install_lang_english_filtered.png b/needles/anaconda_select_install_lang_english_filtered.png index c68661e3..36bdec45 100644 Binary files a/needles/anaconda_select_install_lang_english_filtered.png and b/needles/anaconda_select_install_lang_english_filtered.png differ diff --git a/needles/anaconda_select_install_lang_english_selected.json b/needles/anaconda_select_install_lang_english_selected.json index b8e8f743..6f0500cb 100644 --- a/needles/anaconda_select_install_lang_english_selected.json +++ b/needles/anaconda_select_install_lang_english_selected.json @@ -1,24 +1,24 @@ { - "area": [ - { - "xpos": 201, - "ypos": 176, - "type": "match", - "width": 380, - "height": 51 - }, - { - "xpos": 593, - "ypos": 172, - "type": "match", - "height": 70, - "width": 377 - } - ], "tags": [ "anaconda_select_install_lang_english_selected", "ENV-DESKTOP-default", "ENV-DISTRI-fedora", "ENV-INSTLANG-en_US" + ], + "area": [ + { + "type": "match", + "height": 51, + "ypos": 194, + "xpos": 200, + "width": 356 + }, + { + "type": "match", + "xpos": 593, + "ypos": 190, + "height": 70, + "width": 349 + } ] } \ No newline at end of file diff --git a/needles/anaconda_select_install_lang_english_selected.png b/needles/anaconda_select_install_lang_english_selected.png index 8bf9e07a..b7a49a59 100644 Binary files a/needles/anaconda_select_install_lang_english_selected.png and b/needles/anaconda_select_install_lang_english_selected.png differ diff --git a/needles/bootloader_server.json b/needles/bootloader_server.json index 1c2bffd3..70b97986 100644 --- a/needles/bootloader_server.json +++ b/needles/bootloader_server.json @@ -1,24 +1,31 @@ { "area": [ { - "xpos": 77, - "ypos": 204, - "width": 182, - "height": 29, + "type": "match", + "width": 53, + "height": 24, + "xpos": 249, + "ypos": 147 + }, + { + "width": 114, + "height": 17, + "ypos": 216, + "xpos": 86, "type": "match" }, { - "xpos": 68, - "ypos": 231, - "width": 335, - "height": 17, + "xpos": 78, + "ypos": 232, + "height": 20, + "width": 264, "type": "match" } ], "tags": [ "bootloader", - "ENV-DESKTOP-default", "ENV-DISTRI-fedora", - "ENV-INSTLANG-en_US" + "ENV-INSTLANG-en_US", + "ENV-FLAVOR-server" ] -} +} \ No newline at end of file diff --git a/needles/bootloader_server.png b/needles/bootloader_server.png index 6e0044a6..2e386316 100644 Binary files a/needles/bootloader_server.png and b/needles/bootloader_server.png differ diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index 2de5f6db..d7fcd872 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -39,6 +39,10 @@ sub run { assert_screen "anaconda_select_install_lang_english_selected", 3; assert_and_click "anaconda_select_install_lang_continue"; + if ( get_var("VERSION") eq "rawhide") { + assert_and_click "anaconda_rawhide_accept_fate"; + } + # Anaconda hub assert_screen "anaconda_main_hub", 300; # } diff --git a/tests/disk_guided_delete_all.pm b/tests/disk_guided_delete_all.pm index 49856b2d..d04b8e82 100644 --- a/tests/disk_guided_delete_all.pm +++ b/tests/disk_guided_delete_all.pm @@ -6,11 +6,11 @@ sub run { # Anaconda hub assert_screen "anaconda_main_hub", 300; # - # Default install destination (hdd should be empty for new KVM machine) assert_and_click "anaconda_main_hub_install_destination"; assert_and_click "anaconda_spoke_done"; + # the only provided disk should be full assert_and_click "anaconda_install_destination_reclaim_space_btn"; assert_and_click "anaconda_install_destination_delete_all_btn";