diff --git a/check-needles.py b/check-needles.py index b870f0fe..87920257 100755 --- a/check-needles.py +++ b/check-needles.py @@ -57,11 +57,11 @@ for testpath in testpaths: # now let's do some whitelisting, for awkward cases where we know that # we concatenate string literals and stuff # versioned backgrounds and release IDs -for rel in range(30, 100): +for rel in ["8", "9", "10"]: testliterals.append(f"{rel}_background") testliterals.append(f"version_{rel}_ident") # anaconda id needles, using tell_source -for source in ("workstation", "generic", "server"): +for source in ("generic", "server"): testliterals.append(f"leftbar_{source}") testliterals.append(f"topbar_{source}") # keyboard layout switching, using desktop_switch_layout @@ -69,7 +69,7 @@ for environment in ("anaconda", "gnome"): for layout in ("native", "ascii"): testliterals.append(f"{environment}_layout_{layout}") # package set selection, using get_var('PACKAGE_SET') -for pkgset in ("kde", "workstation", "minimal"): +for pkgset in ("minimal", "server", "graphical-server", "workstation", "virtualization-host"): testliterals.append(f"anaconda_{pkgset}_highlighted") testliterals.append(f"anaconda_{pkgset}_selected") # desktop_login stuff @@ -93,6 +93,16 @@ for dtype in ("lvmvg", "lvmlv", "lvmthin", "raid"): for fsys in ("ext3", "ext4", "xfs", "btrfs", "ppc_prep_boot", "swap", "efi_filesystem"): testliterals.append(f"anaconda_blivet_part_fs_{fsys}") testliterals.append(f"anaconda_blivet_part_fs_{fsys}_selected") +# custom_gui +for dtype in ("", "_lvmlv", "_raid", "_standard_partition"): + testliterals.append(f"anaconda_custom_part_devicetype{dtype}") +for ptype in ("raid_1", "raid_4"): + testliterals.append(f"anaconda_custom_part_{ptype}") + testliterals.append(f"anaconda_custom_part_{ptype}_selected") +for fsys in ("efi_filesystem", "ext4", "swap", "xfs"): + testliterals.append(f"anaconda_custom_part_fs_{fsys}") + testliterals.append(f"anaconda_custom_part_fs_{fsys}_selected") + # this is variable-y in custom_change_type but we only actually have # one value testliterals.append("anaconda_part_device_type_raid") diff --git a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.json b/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.json deleted file mode 100644 index ddacd206..00000000 --- a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 9, - "type": "match", - "width": 139, - "height": 701, - "ypos": 45 - } - ], - "properties": [], - "tags": [ - "leftbar_workstation" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.png b/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.png deleted file mode 100644 index 408d02a7..00000000 Binary files a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.png and /dev/null differ diff --git a/needles/anaconda/identification/leftbar_workstation.json b/needles/anaconda/identification/leftbar_workstation.json deleted file mode 100644 index 80234c6f..00000000 --- a/needles/anaconda/identification/leftbar_workstation.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "properties": [], - "tags": [ - "leftbar_workstation" - ], - "area": [ - { - "xpos": 9, - "ypos": 44, - "width": 139, - "height": 701, - "type": "match" - } - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/leftbar_workstation.png b/needles/anaconda/identification/leftbar_workstation.png deleted file mode 100644 index 870b159b..00000000 Binary files a/needles/anaconda/identification/leftbar_workstation.png and /dev/null differ diff --git a/needles/anaconda/identification/topbar_workstation.json b/needles/anaconda/identification/topbar_workstation.json deleted file mode 100644 index 2f68d19f..00000000 --- a/needles/anaconda/identification/topbar_workstation.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "properties": [], - "tags": [ - "topbar_workstation" - ], - "area": [ - { - "xpos": 95, - "ypos": 69, - "width": 675, - "height": 38, - "type": "match" - } - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/topbar_workstation.png b/needles/anaconda/identification/topbar_workstation.png deleted file mode 100644 index 4df74b40..00000000 Binary files a/needles/anaconda/identification/topbar_workstation.png and /dev/null differ diff --git a/needles/anaconda/identification/version_30.json b/needles/anaconda/identification/version_30.json deleted file mode 100644 index cc4aceba..00000000 --- a/needles/anaconda/identification/version_30.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 796, - "ypos": 40, - "width": 93, - "height": 32, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_30_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_30.png b/needles/anaconda/identification/version_30.png deleted file mode 100644 index d0ff4772..00000000 Binary files a/needles/anaconda/identification/version_30.png and /dev/null differ diff --git a/needles/anaconda/identification/version_31-iot-20200213.json b/needles/anaconda/identification/version_31-iot-20200213.json deleted file mode 100644 index c83f60dc..00000000 --- a/needles/anaconda/identification/version_31-iot-20200213.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "ypos": 13, - "height": 20, - "width": 124, - "type": "match", - "xpos": 764 - } - ], - "properties": [], - "tags": [ - "version_31_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_31-iot-20200213.png b/needles/anaconda/identification/version_31-iot-20200213.png deleted file mode 100644 index efcf33aa..00000000 Binary files a/needles/anaconda/identification/version_31-iot-20200213.png and /dev/null differ diff --git a/needles/anaconda/identification/version_31.json b/needles/anaconda/identification/version_31.json deleted file mode 100644 index 96600023..00000000 --- a/needles/anaconda/identification/version_31.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 783, - "ypos": 40, - "width": 90, - "height": 20, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_31_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_31.png b/needles/anaconda/identification/version_31.png deleted file mode 100644 index 8cd5c919..00000000 Binary files a/needles/anaconda/identification/version_31.png and /dev/null differ diff --git a/needles/anaconda/identification/version_32-iot-20200220.json b/needles/anaconda/identification/version_32-iot-20200220.json deleted file mode 100644 index ec5f8bdf..00000000 --- a/needles/anaconda/identification/version_32-iot-20200220.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 782, - "ypos": 15, - "width": 114, - "height": 17, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_32_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_32-iot-20200220.png b/needles/anaconda/identification/version_32-iot-20200220.png deleted file mode 100644 index 2a8d2fba..00000000 Binary files a/needles/anaconda/identification/version_32-iot-20200220.png and /dev/null differ diff --git a/needles/anaconda/identification/version_32.json b/needles/anaconda/identification/version_32.json deleted file mode 100644 index 345728d0..00000000 --- a/needles/anaconda/identification/version_32.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 787, - "ypos": 15, - "width": 83, - "height": 17, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_32_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_32.png b/needles/anaconda/identification/version_32.png deleted file mode 100644 index 13c34166..00000000 Binary files a/needles/anaconda/identification/version_32.png and /dev/null differ diff --git a/needles/anaconda/identification/version_33-20200817.json b/needles/anaconda/identification/version_33-20200817.json deleted file mode 100644 index 91d371d2..00000000 --- a/needles/anaconda/identification/version_33-20200817.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 784, - "height": 19, - "ypos": 13, - "width": 85, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_33_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_33-20200817.png b/needles/anaconda/identification/version_33-20200817.png deleted file mode 100644 index a0870ae0..00000000 Binary files a/needles/anaconda/identification/version_33-20200817.png and /dev/null differ diff --git a/needles/anaconda/identification/version_33_iot.json b/needles/anaconda/identification/version_33_iot.json deleted file mode 100644 index 15a92f8d..00000000 --- a/needles/anaconda/identification/version_33_iot.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 778, - "ypos": 13, - "width": 118, - "height": 19, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_33_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_33_iot.png b/needles/anaconda/identification/version_33_iot.png deleted file mode 100644 index 63df8740..00000000 Binary files a/needles/anaconda/identification/version_33_iot.png and /dev/null differ diff --git a/needles/anaconda/identification/version_34-20210210.json b/needles/anaconda/identification/version_34-20210210.json deleted file mode 100644 index d93ea560..00000000 --- a/needles/anaconda/identification/version_34-20210210.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "ypos": 14, - "height": 17, - "xpos": 785, - "type": "match", - "width": 87 - } - ], - "properties": [], - "tags": [ - "version_34_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_34-20210210.png b/needles/anaconda/identification/version_34-20210210.png deleted file mode 100644 index f3a3dd27..00000000 Binary files a/needles/anaconda/identification/version_34-20210210.png and /dev/null differ diff --git a/needles/anaconda/identification/version_34_iot-20200824.json b/needles/anaconda/identification/version_34_iot-20200824.json deleted file mode 100644 index 14d73e6d..00000000 --- a/needles/anaconda/identification/version_34_iot-20200824.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 778, - "ypos": 14, - "width": 117, - "height": 17, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_34_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_34_iot-20200824.png b/needles/anaconda/identification/version_34_iot-20200824.png deleted file mode 100644 index a66afdcc..00000000 Binary files a/needles/anaconda/identification/version_34_iot-20200824.png and /dev/null differ diff --git a/needles/anaconda/identification/version_35_iot-20210218.json b/needles/anaconda/identification/version_35_iot-20210218.json deleted file mode 100644 index 7887ea7b..00000000 --- a/needles/anaconda/identification/version_35_iot-20210218.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 778, - "ypos": 14, - "width": 118, - "height": 18, - "type": "match" - } - ], - "properties": [], - "tags": [ - "version_35_ident" - ] -} \ No newline at end of file diff --git a/needles/anaconda/identification/version_35_iot-20210218.png b/needles/anaconda/identification/version_35_iot-20210218.png deleted file mode 100644 index 89808ce6..00000000 Binary files a/needles/anaconda/identification/version_35_iot-20210218.png and /dev/null differ diff --git a/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.json b/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.json new file mode 100644 index 00000000..bf8ce912 --- /dev/null +++ b/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.json @@ -0,0 +1,21 @@ +{ + "area": [ + { + "xpos": 25, + "height": 21, + "type": "match", + "width": 66, + "click_point": { + "xpos": 44.5, + "ypos": 10.5 + }, + "ypos": 704 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-arabic", + "anaconda_main_hub_begin_installation" + ] +} \ No newline at end of file diff --git a/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.png b/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.png new file mode 100644 index 00000000..c5542f55 Binary files /dev/null and b/needles/anaconda/main_hub/arabic/rocky-begin_installation_arabic-20240716.png differ diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.png diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.json similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.json diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.png similarity index 100% rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.png rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.png diff --git a/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.json b/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.json new file mode 100644 index 00000000..7fbedc2c --- /dev/null +++ b/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "ypos": 124, + "xpos": 588, + "type": "match", + "height": 18, + "width": 104 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-arabic", + "anaconda_graphical-server_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.png b/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.png new file mode 100644 index 00000000..f7cc8d68 Binary files /dev/null and b/needles/anaconda/package_selection/arabic/rocky-anaconda_graphical-server_selected-arabic-20240716.png differ diff --git a/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.json b/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.json new file mode 100644 index 00000000..2311a693 --- /dev/null +++ b/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "ypos": 125, + "width": 134, + "xpos": 29, + "height": 17, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-french", + "anaconda_graphical-server_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.png b/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.png new file mode 100644 index 00000000..03ec7406 Binary files /dev/null and b/needles/anaconda/package_selection/french/rocky-anaconda_graphical-server_selected-french-20240716.png differ diff --git a/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.json b/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.json new file mode 100644 index 00000000..952cc37a --- /dev/null +++ b/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "ypos": 136, + "width": 124, + "type": "match", + "height": 18, + "xpos": 46 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-japanese", + "anaconda_graphical-server_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.png b/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.png new file mode 100644 index 00000000..827c17db Binary files /dev/null and b/needles/anaconda/package_selection/japanese/rocky-anaconda_graphical-server_selected-japanese-20240716.png differ diff --git a/needles/anaconda/package_selection/kde_highlighted-20210716.json b/needles/anaconda/package_selection/kde_highlighted-20210716.json deleted file mode 100644 index b8308574..00000000 --- a/needles/anaconda/package_selection/kde_highlighted-20210716.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "height": 12, - "ypos": 331, - "type": "match", - "width": 26, - "xpos": 49 - } - ], - "properties": [], - "tags": [ - "anaconda_kde_highlighted" - ] -} \ No newline at end of file diff --git a/needles/anaconda/package_selection/kde_highlighted-20210716.png b/needles/anaconda/package_selection/kde_highlighted-20210716.png deleted file mode 100644 index cbd16497..00000000 Binary files a/needles/anaconda/package_selection/kde_highlighted-20210716.png and /dev/null differ diff --git a/needles/anaconda/package_selection/kde_highlighted-freetype262.json b/needles/anaconda/package_selection/kde_highlighted-freetype262.json deleted file mode 100644 index 69a4d4e3..00000000 --- a/needles/anaconda/package_selection/kde_highlighted-freetype262.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tags": [ - "anaconda_kde_highlighted" - ], - "area": [ - { - "ypos": 294, - "type": "match", - "height": 12, - "xpos": 53, - "width": 26 - } - ], - "properties": [] -} \ No newline at end of file diff --git a/needles/anaconda/package_selection/kde_highlighted-freetype262.png b/needles/anaconda/package_selection/kde_highlighted-freetype262.png deleted file mode 100644 index e069907d..00000000 Binary files a/needles/anaconda/package_selection/kde_highlighted-freetype262.png and /dev/null differ diff --git a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.json b/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.json deleted file mode 100644 index cc307152..00000000 --- a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "ypos": 331, - "type": "match", - "height": 12, - "width": 49, - "xpos": 29 - } - ], - "properties": [], - "tags": [ - "anaconda_kde_selected" - ] -} \ No newline at end of file diff --git a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.png b/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.png deleted file mode 100644 index 13552203..00000000 Binary files a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.png and /dev/null differ diff --git a/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.json b/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.json new file mode 100644 index 00000000..d841ed9b --- /dev/null +++ b/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.json @@ -0,0 +1,24 @@ +{ + "area": [ + { + "xpos": 35, + "type": "match", + "height": 15, + "width": 105, + "ypos": 147 + }, + { + "xpos": 216, + "ypos": 166, + "width": 247, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-russian", + "anaconda_graphical-server_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.png b/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.png new file mode 100644 index 00000000..c7eeb1a5 Binary files /dev/null and b/needles/anaconda/package_selection/russian/rocky-anaconda_graphical-server_selected-russian-20240716.png differ diff --git a/needles/anaconda/partitioning/rocky-device_root_resized_eleven_point_five.json b/needles/anaconda/partitioning/rocky-device_root_resized_eleven_point_five.json new file mode 100644 index 00000000..03bd2aa9 --- /dev/null +++ b/needles/anaconda/partitioning/rocky-device_root_resized_eleven_point_five.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "ypos": 135, + "xpos": 374, + "height": 22, + "width": 74, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "device_root_resized_eleven_point_five" + ] +} diff --git a/needles/anaconda/partitioning/rocky-device_root_resized_eleven_point_five.png b/needles/anaconda/partitioning/rocky-device_root_resized_eleven_point_five.png new file mode 100644 index 00000000..a0565de5 Binary files /dev/null and b/needles/anaconda/partitioning/rocky-device_root_resized_eleven_point_five.png differ diff --git a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20210814.json b/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20210814.json deleted file mode 100644 index 79bde9ef..00000000 --- a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20210814.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "height": 22, - "ypos": 139, - "xpos": 394, - "type": "match", - "width": 74 - } - ], - "properties": [], - "tags": [ - "ENV-DISTRI-rocky", - "device_root_resized_twelve" - ] -} \ No newline at end of file diff --git a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20210814.png b/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20210814.png deleted file mode 100644 index db9676ea..00000000 Binary files a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20210814.png and /dev/null differ diff --git a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20220627.json b/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20220627.json deleted file mode 100644 index 053248f9..00000000 --- a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20220627.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "xpos": 394, - "width": 74, - "type": "match", - "ypos": 147, - "height": 22 - } - ], - "properties": [], - "tags": [ - "ENV-DISTRI-rocky", - "device_root_resized_twelve" - ] -} \ No newline at end of file diff --git a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20220627.png b/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20220627.png deleted file mode 100644 index e3d8975f..00000000 Binary files a/needles/anaconda/partitioning/rocky-device_root_resized_twelve-20220627.png and /dev/null differ diff --git a/needles/background/33_background-1222-20210715.json b/needles/background/33_background-1222-20210715.json deleted file mode 100644 index 2882c3e9..00000000 --- a/needles/background/33_background-1222-20210715.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "ypos": 225, - "type": "match", - "width": 104, - "xpos": 837, - "height": 121 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-1222-20210715.png b/needles/background/33_background-1222-20210715.png deleted file mode 100644 index f594ad56..00000000 Binary files a/needles/background/33_background-1222-20210715.png and /dev/null differ diff --git a/needles/background/33_background-dawn-20200831.json b/needles/background/33_background-dawn-20200831.json deleted file mode 100644 index b97daef9..00000000 --- a/needles/background/33_background-dawn-20200831.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "type": "match", - "match": 90, - "width": 81, - "height": 129, - "xpos": 833, - "ypos": 74 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-dawn-20200831.png b/needles/background/33_background-dawn-20200831.png deleted file mode 100644 index 8170705d..00000000 Binary files a/needles/background/33_background-dawn-20200831.png and /dev/null differ diff --git a/needles/background/33_background-dawn-20201007.json b/needles/background/33_background-dawn-20201007.json deleted file mode 100644 index aae0cd74..00000000 --- a/needles/background/33_background-dawn-20201007.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "type": "match", - "match": 90, - "width": 104, - "ypos": 225, - "height": 121, - "xpos": 691 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-dawn-20201007.png b/needles/background/33_background-dawn-20201007.png deleted file mode 100644 index cfeea660..00000000 Binary files a/needles/background/33_background-dawn-20201007.png and /dev/null differ diff --git a/needles/background/33_background-dawnday-20201008.json b/needles/background/33_background-dawnday-20201008.json deleted file mode 100644 index d536fc49..00000000 --- a/needles/background/33_background-dawnday-20201008.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 838, - "height": 121, - "ypos": 225, - "width": 104, - "type": "match" - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-dawnday-20201008.png b/needles/background/33_background-dawnday-20201008.png deleted file mode 100644 index febf06a1..00000000 Binary files a/needles/background/33_background-dawnday-20201008.png and /dev/null differ diff --git a/needles/background/33_background-dawnday-20201011.json b/needles/background/33_background-dawnday-20201011.json deleted file mode 100644 index 8eca675f..00000000 --- a/needles/background/33_background-dawnday-20201011.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "width": 104, - "type": "match", - "match": 90, - "height": 121, - "xpos": 691, - "ypos": 225 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-dawnday-20201011.png b/needles/background/33_background-dawnday-20201011.png deleted file mode 100644 index 3fd9f13c..00000000 Binary files a/needles/background/33_background-dawnday-20201011.png and /dev/null differ diff --git a/needles/background/33_background-day-20200821.json b/needles/background/33_background-day-20200821.json deleted file mode 100644 index bc54fb4c..00000000 --- a/needles/background/33_background-day-20200821.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "xpos": 833, - "height": 129, - "ypos": 74, - "type": "match", - "match": 90, - "width": 81 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-day-20200821.png b/needles/background/33_background-day-20200821.png deleted file mode 100644 index 5e801654..00000000 Binary files a/needles/background/33_background-day-20200821.png and /dev/null differ diff --git a/needles/background/33_background-day-20201006.json b/needles/background/33_background-day-20201006.json deleted file mode 100644 index f7869e58..00000000 --- a/needles/background/33_background-day-20201006.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "width": 104, - "type": "match", - "match": 90, - "height": 121, - "xpos": 838, - "ypos": 225 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-day-20201006.png b/needles/background/33_background-day-20201006.png deleted file mode 100644 index 21eb139a..00000000 Binary files a/needles/background/33_background-day-20201006.png and /dev/null differ diff --git a/needles/background/33_background-dusk-20200825.json b/needles/background/33_background-dusk-20200825.json deleted file mode 100644 index 79d54fd7..00000000 --- a/needles/background/33_background-dusk-20200825.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "width": 81, - "type": "match", - "match": 90, - "ypos": 74, - "height": 129, - "xpos": 833 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-dusk-20200825.png b/needles/background/33_background-dusk-20200825.png deleted file mode 100644 index ebb6df06..00000000 Binary files a/needles/background/33_background-dusk-20200825.png and /dev/null differ diff --git a/needles/background/33_background-dusknight-20210122.json b/needles/background/33_background-dusknight-20210122.json deleted file mode 100644 index 1a8baabf..00000000 --- a/needles/background/33_background-dusknight-20210122.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "ypos": 225, - "type": "match", - "match": 90, - "xpos": 691, - "height": 121, - "width": 104 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-dusknight-20210122.png b/needles/background/33_background-dusknight-20210122.png deleted file mode 100644 index 8c888ab8..00000000 Binary files a/needles/background/33_background-dusknight-20210122.png and /dev/null differ diff --git a/needles/background/33_background-night-20200821.json b/needles/background/33_background-night-20200821.json deleted file mode 100644 index e9975750..00000000 --- a/needles/background/33_background-night-20200821.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 836, - "ypos": 72, - "width": 81, - "height": 129, - "type": "match" - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-night-20200821.png b/needles/background/33_background-night-20200821.png deleted file mode 100644 index 97601ab1..00000000 Binary files a/needles/background/33_background-night-20200821.png and /dev/null differ diff --git a/needles/background/33_background-night-20201007.json b/needles/background/33_background-night-20201007.json deleted file mode 100644 index b81a9567..00000000 --- a/needles/background/33_background-night-20201007.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "width": 104, - "type": "match", - "match": 90, - "ypos": 225, - "height": 121, - "xpos": 691 - } - ], - "properties": [], - "tags": [ - "33_background" - ] -} \ No newline at end of file diff --git a/needles/background/33_background-night-20201007.png b/needles/background/33_background-night-20201007.png deleted file mode 100644 index d76ffb32..00000000 Binary files a/needles/background/33_background-night-20201007.png and /dev/null differ diff --git a/needles/background/34_background-day-20210212.json b/needles/background/34_background-day-20210212.json deleted file mode 100644 index 3f7eee03..00000000 --- a/needles/background/34_background-day-20210212.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "type": "match", - "match": 90, - "width": 142, - "xpos": 794, - "ypos": 313, - "height": 132 - } - ], - "properties": [], - "tags": [ - "34_background" - ] -} \ No newline at end of file diff --git a/needles/background/34_background-day-20210212.png b/needles/background/34_background-day-20210212.png deleted file mode 100644 index a1dff46b..00000000 Binary files a/needles/background/34_background-day-20210212.png and /dev/null differ diff --git a/needles/background/34_background-night-20210210.json b/needles/background/34_background-night-20210210.json deleted file mode 100644 index 44499393..00000000 --- a/needles/background/34_background-night-20210210.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 794, - "ypos": 313, - "width": 142, - "height": 132, - "type": "match" - } - ], - "properties": [], - "tags": [ - "34_background" - ] -} \ No newline at end of file diff --git a/needles/background/34_background-night-20210210.png b/needles/background/34_background-night-20210210.png deleted file mode 100644 index e4821ab4..00000000 Binary files a/needles/background/34_background-night-20210210.png and /dev/null differ diff --git a/needles/background/34_background-transition1-20210302.json b/needles/background/34_background-transition1-20210302.json deleted file mode 100644 index a2dbf8d1..00000000 --- a/needles/background/34_background-transition1-20210302.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "height": 132, - "ypos": 312, - "xpos": 794, - "width": 142, - "type": "match" - } - ], - "properties": [], - "tags": [ - "34_background" - ] -} \ No newline at end of file diff --git a/needles/background/34_background-transition1-20210302.png b/needles/background/34_background-transition1-20210302.png deleted file mode 100644 index d0f30455..00000000 Binary files a/needles/background/34_background-transition1-20210302.png and /dev/null differ diff --git a/needles/background/34_background-transition2-20210302.json b/needles/background/34_background-transition2-20210302.json deleted file mode 100644 index 0f024e03..00000000 --- a/needles/background/34_background-transition2-20210302.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "type": "match", - "match": 90, - "width": 142, - "ypos": 313, - "height": 132, - "xpos": 794 - } - ], - "properties": [], - "tags": [ - "34_background" - ] -} \ No newline at end of file diff --git a/needles/background/34_background-transition2-20210302.png b/needles/background/34_background-transition2-20210302.png deleted file mode 100644 index 99243d9e..00000000 Binary files a/needles/background/34_background-transition2-20210302.png and /dev/null differ diff --git a/needles/background/34_background-transition3-20210302.json b/needles/background/34_background-transition3-20210302.json deleted file mode 100644 index 1da4727c..00000000 --- a/needles/background/34_background-transition3-20210302.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "area": [ - { - "xpos": 794, - "ypos": 314, - "height": 132, - "type": "match", - "match": 90, - "width": 142 - } - ], - "properties": [], - "tags": [ - "34_background" - ] -} \ No newline at end of file diff --git a/needles/background/34_background-transition3-20210302.png b/needles/background/34_background-transition3-20210302.png deleted file mode 100644 index aedcd757..00000000 Binary files a/needles/background/34_background-transition3-20210302.png and /dev/null differ diff --git a/needles/console/rocky-boot_enter_passphrase-20240717.json b/needles/console/rocky-boot_enter_passphrase-20240717.json new file mode 100644 index 00000000..3549489b --- /dev/null +++ b/needles/console/rocky-boot_enter_passphrase-20240717.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 10, + "ypos": 646, + "height": 16, + "type": "match", + "width": 152 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "boot_enter_passphrase" + ] +} \ No newline at end of file diff --git a/needles/console/rocky-boot_enter_passphrase-20240717.png b/needles/console/rocky-boot_enter_passphrase-20240717.png new file mode 100644 index 00000000..e6acc808 Binary files /dev/null and b/needles/console/rocky-boot_enter_passphrase-20240717.png differ diff --git a/needles/console/rocky-boot_enter_passphrase-arabic-20240716.json b/needles/console/rocky-boot_enter_passphrase-arabic-20240716.json new file mode 100644 index 00000000..7643067b --- /dev/null +++ b/needles/console/rocky-boot_enter_passphrase-arabic-20240716.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "ypos": 420, + "height": 21, + "xpos": 613, + "type": "match", + "width": 83 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-arabic", + "boot_enter_passphrase" + ] +} diff --git a/needles/console/rocky-boot_enter_passphrase-arabic-20240716.png b/needles/console/rocky-boot_enter_passphrase-arabic-20240716.png new file mode 100644 index 00000000..a207591b Binary files /dev/null and b/needles/console/rocky-boot_enter_passphrase-arabic-20240716.png differ diff --git a/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.json b/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.json new file mode 100644 index 00000000..aa77177c --- /dev/null +++ b/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "height": 21, + "type": "match", + "xpos": 328, + "width": 97, + "ypos": 280 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-japanese", + "desktop_input_source_japanese_anthy" + ] +} \ No newline at end of file diff --git a/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.png b/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.png new file mode 100644 index 00000000..f91ea9be Binary files /dev/null and b/needles/gnome/japanese/rocky-desktop_input_source_japanese_anthy-20240716.png differ diff --git a/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.json b/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.json new file mode 100644 index 00000000..9c3b6200 --- /dev/null +++ b/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 379, + "height": 24, + "type": "match", + "width": 23, + "ypos": 52 + } + ], + "properties": [], + "tags": [ + "DESKTOP-gnome", + "LANGUAGE-japanese", + "desktop_yama_kanji" + ] +} \ No newline at end of file diff --git a/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.png b/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.png new file mode 100644 index 00000000..13f0fd40 Binary files /dev/null and b/needles/gnome/japanese/rocky-yama_kanji-japanese-20240716.png differ diff --git a/templates.fif.json b/templates.fif.json index 3a99d177..dcd6bb61 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -400,6 +400,10 @@ "machine": "aarch64", "product": "rocky-minimal-iso-aarch64-*" }, + "rocky-minimal-iso-x86_64-*-uefi": { + "machine": "uefi", + "product": "rocky-minimal-iso-x86_64-*" + }, "rocky-minimal-iso-x86_64-*-bios": { "machine": "bios", "product": "rocky-minimal-iso-x86_64-*" @@ -471,7 +475,7 @@ "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "ENTRYPOINT": "_boot_to_anaconda anaconda_help", @@ -480,14 +484,14 @@ }, "base_reboot_unmount": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -501,14 +505,14 @@ }, "base_system_logging": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -522,14 +526,14 @@ }, "base_update_cli": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -543,14 +547,14 @@ }, "base_package_install_remove": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "BOOTFROM": "c", @@ -564,14 +568,14 @@ }, "base_services_start": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "BOOTFROM": "c", @@ -585,14 +589,14 @@ }, "base_selinux": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "BOOTFROM": "c", @@ -606,14 +610,14 @@ }, "base_service_manipulation": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30, "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "BOOTFROM": "c", @@ -627,9 +631,9 @@ }, "cloud_autocloud": { "profiles": { - "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_Base-qcow2-qcow2-x86_64-*-uefi": 30, - "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 30, + "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-bios": 31, "rocky-GenericCloud_LVM-qcow2-qcow2-x86_64-*-uefi": 30 }, "settings": { @@ -641,7 +645,8 @@ "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-bios": 41, + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "false", @@ -658,7 +663,7 @@ "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20 + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "ANACONDA_TEXT": "1" @@ -669,7 +674,7 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40 + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "gnome", @@ -689,7 +694,7 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40 + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "gnome", @@ -709,8 +714,8 @@ "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40, - "rocky-dvd-iso-x86_64-*-uefi": 41 + "rocky-dvd-iso-x86_64-*-bios": 41, + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "false", @@ -726,8 +731,8 @@ "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40, - "rocky-dvd-iso-x86_64-*-uefi": 41 + "rocky-dvd-iso-x86_64-*-bios": 41, + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "false", @@ -741,8 +746,8 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40, - "rocky-universal-x86_64-*-uefi": 41 + "rocky-universal-x86_64-*-bios": 41, + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "NUMDISKS": "2", @@ -758,8 +763,8 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40, - "rocky-universal-x86_64-*-uefi": 41 + "rocky-universal-x86_64-*-bios": 41, + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "PARTITIONING": "custom_gui_xfs", @@ -774,7 +779,7 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40 + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "gnome", @@ -794,8 +799,8 @@ "rocky-boot-iso-s390x-*-s390x": 10, "rocky-boot-iso-ppc64le-*-ppc64le": 10, "rocky-boot-iso-aarch64-*-aarch64": 10, - "rocky-boot-iso-x86_64-*-bios": 10, - "rocky-boot-iso-x86_64-*-uefi": 11, + "rocky-boot-iso-x86_64-*-bios": 11, + "rocky-boot-iso-x86_64-*-uefi": 10, "rocky-dvd-iso-s390x-*-s390x": 11, "rocky-dvd-iso-ppc64le-*-ppc64le": 11, "rocky-dvd-iso-aarch64-*-aarch64": 11, @@ -812,12 +817,13 @@ "rocky-boot-iso-s390x-*-s390x": 10, "rocky-boot-iso-ppc64le-*-ppc64le": 10, "rocky-boot-iso-aarch64-*-aarch64": 10, - "rocky-boot-iso-x86_64-*-bios": 10, - "rocky-boot-iso-x86_64-*-uefi": 11, + "rocky-boot-iso-x86_64-*-bios": 11, + "rocky-boot-iso-x86_64-*-uefi": 10, "rocky-minimal-iso-s390x-*-s390x": 10, "rocky-minimal-iso-ppc64le-*-ppc64le": 10, "rocky-minimal-iso-aarch64-*-aarch64": 10, - "rocky-minimal-iso-x86_64-*-bios": 10 + "rocky-minimal-iso-x86_64-*-uefi": 10, + "rocky-minimal-iso-x86_64-*-bios": 11 }, "settings": { "PACKAGE_SET": "minimal", @@ -829,7 +835,8 @@ "rocky-minimal-iso-s390x-*-s390x": 10, "rocky-minimal-iso-ppc64le-*-ppc64le": 10, "rocky-minimal-iso-aarch64-*-aarch64": 10, - "rocky-minimal-iso-x86_64-*-bios": 10 + "rocky-minimal-iso-x86_64-*-uefi": 10, + "rocky-minimal-iso-x86_64-*-bios": 11 }, "settings": { "PACKAGE_SET": "minimal", @@ -842,8 +849,7 @@ "rocky-dvd-iso-s390x-*-s390x": 10, "rocky-dvd-iso-ppc64le-*-ppc64le": 10, "rocky-dvd-iso-aarch64-*-aarch64": 10, - "rocky-dvd-iso-x86_64-*-uefi": 10, - "rocky-dvd-iso-x86_64-*-bios": 10 + "rocky-dvd-iso-x86_64-*-uefi": 10 }, "settings": { "DESKTOP": "gnome", @@ -857,8 +863,8 @@ "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30, - "rocky-universal-x86_64-*-uefi": 31 + "rocky-universal-x86_64-*-bios": 31, + "rocky-universal-x86_64-*-uefi": 30 }, "settings": { "HDD_1": "disk_full_%PART_TABLE_TYPE%.img", @@ -873,8 +879,8 @@ "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20, - "rocky-universal-x86_64-*-uefi": 21 + "rocky-universal-x86_64-*-bios": 21, + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "HDDMODEL": "ide-hd", @@ -890,7 +896,7 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40 + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "gnome", @@ -908,7 +914,7 @@ "install_iscsi": { "profiles": { "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40 + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "ANACONDA_STATIC": "172.16.2.111", @@ -923,7 +929,7 @@ "install_kickstart_nfs": { "profiles": { "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30 + "rocky-universal-x86_64-*-uefi": 30 }, "settings": { "GRUB": "inst.ks=nfs:172.16.2.110:/export/root-user-crypted-net.ks", @@ -941,8 +947,8 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40, - "rocky-universal-x86_64-*-uefi": 41 + "rocky-universal-x86_64-*-bios": 41, + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "PARTITIONING": "custom_lvmthin", @@ -956,8 +962,8 @@ "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40, - "rocky-dvd-iso-x86_64-*-uefi": 41 + "rocky-dvd-iso-x86_64-*-bios": 41, + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "DESKTOP": "false", @@ -972,8 +978,8 @@ "rocky-dvd-iso-s390x-*-s390x": 30, "rocky-dvd-iso-ppc64le-*-ppc64le": 30, "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30, - "rocky-dvd-iso-x86_64-*-uefi": 31 + "rocky-dvd-iso-x86_64-*-bios": 31, + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "DESKTOP": "gnome", @@ -986,7 +992,7 @@ "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20 + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "MIRRORLIST_GRAPHICAL": "1", @@ -998,8 +1004,8 @@ "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20, - "rocky-universal-x86_64-*-uefi": 21 + "rocky-universal-x86_64-*-bios": 21, + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "HDD_2": "disk_full_mbr.img", @@ -1015,8 +1021,8 @@ "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30, - "rocky-universal-x86_64-*-uefi": 31 + "rocky-universal-x86_64-*-bios": 31, + "rocky-universal-x86_64-*-uefi": 30 }, "settings": { "NUMDISKS": "2", @@ -1031,8 +1037,8 @@ "rocky-universal-s390x-*-s390x": 50, "rocky-universal-ppc64le-*-ppc64le": 50, "rocky-universal-aarch64-*-aarch64": 50, - "rocky-universal-x86_64-*-bios": 50, - "rocky-universal-x86_64-*-uefi": 51 + "rocky-universal-x86_64-*-bios": 51, + "rocky-universal-x86_64-*-uefi": 50 }, "settings": { "PARTITIONING": "custom_with_swap", @@ -1043,7 +1049,8 @@ }, "install_package_set_minimal": { "profiles": { - "rocky-package-set-x86_64-*-bios": 30 + "rocky-package-set-aarch64-*-aarch64": 30, + "rocky-package-set-x86_64-*-uefi": 30 }, "settings": { "DESKTOP": "false", @@ -1052,7 +1059,8 @@ }, "install_package_set_server": { "profiles": { - "rocky-package-set-x86_64-*-bios": 30 + "rocky-package-set-aarch64-*-aarch64": 30, + "rocky-package-set-x86_64-*-uefi": 30 }, "settings": { "DESKTOP": "false", @@ -1061,7 +1069,8 @@ }, "install_package_set_graphical-server": { "profiles": { - "rocky-package-set-x86_64-*-bios": 30 + "rocky-package-set-aarch64-*-aarch64": 30, + "rocky-package-set-x86_64-*-uefi": 30 }, "settings": { "DESKTOP": "gnome", @@ -1070,7 +1079,7 @@ }, "install_package_set_workstation": { "profiles": { - "rocky-package-set-x86_64-*-bios": 30 + "rocky-package-set-x86_64-*-uefi": 30 }, "settings": { "DESKTOP": "gnome", @@ -1079,7 +1088,7 @@ }, "install_package_set_virtualization-host": { "profiles": { - "rocky-package-set-x86_64-*-bios": 30 + "rocky-package-set-x86_64-*-uefi": 30 }, "settings": { "DESKTOP": "false", @@ -1089,15 +1098,15 @@ "install_pxeboot": { "profiles": { "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30, - "rocky-universal-x86_64-*-uefi": 31 + "rocky-universal-x86_64-*-uefi": 30, + "rocky-universal-x86_64-*-bios": 31 }, "settings": { "+ISO": "", "DELAYED_START": "1", "KICKSTART": "1", "NICTYPE": "tap", - "PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%", + "PARALLEL_WITH": "support_server@bios", "PXEBOOT": "once", "ROOT_PASSWORD": "111111", "TEST_TARGET": "COMPOSE", @@ -1110,7 +1119,7 @@ "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20 + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "REPOSITORY_GRAPHICAL": "%LOCATION%", @@ -1123,7 +1132,7 @@ "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20 + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "REPOSITORY_VARIATION": "%LOCATION%", @@ -1136,7 +1145,7 @@ "rocky-dvd-iso-s390x-*-s390x": 30, "rocky-dvd-iso-ppc64le-*-ppc64le": 30, "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "INSTALL_UNLOCK": "support_ready", @@ -1149,7 +1158,7 @@ "install_repository_nfs_variation": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "INSTALL_UNLOCK": "support_ready", @@ -1162,7 +1171,7 @@ "install_repository_nfsiso_variation": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "INSTALL_UNLOCK": "support_ready", @@ -1177,8 +1186,8 @@ "rocky-universal-s390x-*-s390x": 31, "rocky-universal-ppc64le-*-ppc64le": 31, "rocky-universal-aarch64-*-aarch64": 31, - "rocky-universal-x86_64-*-bios": 31, - "rocky-universal-x86_64-*-uefi": 32 + "rocky-universal-x86_64-*-bios": 32, + "rocky-universal-x86_64-*-uefi": 31 }, "settings": { "BOOTFROM": "d", @@ -1192,8 +1201,8 @@ "rocky-universal-s390x-*-s390x": 20, "rocky-universal-ppc64le-*-ppc64le": 20, "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20, - "rocky-universal-x86_64-*-uefi": 21 + "rocky-universal-x86_64-*-bios": 21, + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "ATACONTROLLER": "ich9-ahci", @@ -1205,7 +1214,7 @@ "install_scsi_updates_img": { "profiles": { "rocky-universal-aarch64-*-aarch64": 20, - "rocky-universal-x86_64-*-bios": 20 + "rocky-universal-x86_64-*-uefi": 20 }, "settings": { "CDMODEL": "scsi-cd", @@ -1221,8 +1230,7 @@ "profiles": { "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, - "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30 + "rocky-universal-aarch64-*-aarch64": 30 }, "settings": { "ANACONDA_TEXT": "1", @@ -1236,7 +1244,7 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40 + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "HDD_1": "disk_shrink_ext4.img", @@ -1251,7 +1259,7 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40 + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "HDD_1": "disk_shrink_ntfs.img", @@ -1264,8 +1272,8 @@ "install_simple_encrypted": { "profiles": { "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30, - "rocky-universal-x86_64-*-uefi": 31 + "rocky-universal-x86_64-*-bios": 31, + "rocky-universal-x86_64-*-uefi": 30 }, "settings": { "ENCRYPT_PASSWORD": "weakpassword", @@ -1279,8 +1287,8 @@ "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30, - "rocky-universal-x86_64-*-uefi": 31 + "rocky-universal-x86_64-*-bios": 31, + "rocky-universal-x86_64-*-uefi": 30 }, "settings": { "HDD_1": "disk_freespace_%PART_TABLE_TYPE%.img", @@ -1296,8 +1304,8 @@ "rocky-universal-s390x-*-s390x": 30, "rocky-universal-ppc64le-*-ppc64le": 30, "rocky-universal-aarch64-*-aarch64": 30, - "rocky-universal-x86_64-*-bios": 30, - "rocky-universal-x86_64-*-uefi": 31 + "rocky-universal-x86_64-*-bios": 31, + "rocky-universal-x86_64-*-uefi": 30 }, "settings": { "NUMDISKS": "2", @@ -1310,7 +1318,7 @@ "install_updates_nfs": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "GRUB": "inst.stage2=nfs:nfsvers=4:172.16.2.110:/repo", @@ -1325,7 +1333,7 @@ "install_vnc_client": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "BOOTFROM": "c", @@ -1342,7 +1350,7 @@ "install_vnc_server": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "GRUB": "inst.vnc net.ifnames=0 biosdevname=0 ip=172.16.2.114::172.16.2.2:255.255.255.0:vnc001.test.openqa.rockylinux.org:eth0:off", @@ -1354,7 +1362,7 @@ "install_vncconnect_client": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "BOOTFROM": "c", @@ -1370,7 +1378,7 @@ "install_vncconnect_server": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "GRUB": "inst.vnc inst.vncconnect=172.16.2.117:5500 net.ifnames=0 biosdevname=0 ip=172.16.2.116::172.16.2.2:255.255.255.0:vnc003.test.openqa.rockylinux.org:eth0:off", @@ -1386,8 +1394,8 @@ "rocky-universal-s390x-*-s390x": 40, "rocky-universal-ppc64le-*-ppc64le": 40, "rocky-universal-aarch64-*-aarch64": 40, - "rocky-universal-x86_64-*-bios": 40, - "rocky-universal-x86_64-*-uefi": 41 + "rocky-universal-x86_64-*-bios": 41, + "rocky-universal-x86_64-*-uefi": 40 }, "settings": { "PARTITIONING": "custom_xfs", @@ -1412,7 +1420,7 @@ "rocky-dvd-iso-s390x-*-s390x": 30, "rocky-dvd-iso-ppc64le-*-ppc64le": 30, "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "BOOTFROM": "c", @@ -1427,7 +1435,7 @@ "realmd_join_cockpit": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "+HDD_1": "disk_%MACHINE%_cockpit.qcow2", @@ -1445,7 +1453,7 @@ "realmd_join_sssd": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1465,7 +1473,7 @@ "rocky-dvd-iso-s390x-*-s390x": 40, "rocky-dvd-iso-ppc64le-*-ppc64le": 40, "rocky-dvd-iso-aarch64-*-aarch64": 40, - "rocky-dvd-iso-x86_64-*-bios": 40 + "rocky-dvd-iso-x86_64-*-uefi": 40 }, "settings": { "BOOTFROM": "c", @@ -1477,7 +1485,7 @@ }, "secure_boot_fallback": { "profiles": { - "rocky-dvd-iso-x86_64-*-uefi": 11 + "rocky-dvd-iso-x86_64-*-uefi": 10 }, "settings": { "BOOTFROM": "c", @@ -1491,7 +1499,7 @@ "server_cockpit_basic": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "+HDD_1": "disk_%MACHINE%_cockpit.qcow2", @@ -1505,7 +1513,7 @@ "server_cockpit_default": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1521,7 +1529,7 @@ "server_cockpit_updates": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "+HDD_1": "disk_%MACHINE%_cockpit.qcow2", @@ -1535,7 +1543,7 @@ "server_database_client": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 30 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "BOOTFROM": "c", @@ -1555,7 +1563,7 @@ "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1572,7 +1580,7 @@ "rocky-dvd-iso-s390x-*-s390x": 20, "rocky-dvd-iso-ppc64le-*-ppc64le": 20, "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1585,7 +1593,7 @@ "server_freeipa_replication_client": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "BOOTFROM": "c", @@ -1604,7 +1612,7 @@ "server_freeipa_replication_master": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "BOOTFROM": "c", @@ -1623,7 +1631,7 @@ "server_freeipa_replication_replica": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 30, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 30 }, "settings": { "BOOTFROM": "c", @@ -1643,7 +1651,7 @@ "server_realmd_join_kickstart": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "GRUB": "inst.ks=hd:vdb1:/freeipaclient.ks", @@ -1662,7 +1670,7 @@ "server_remote_logging_client": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1680,7 +1688,7 @@ "server_remote_logging_server": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1698,7 +1706,7 @@ "server_role_deploy_database_server": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1716,7 +1724,7 @@ "server_role_deploy_domain_controller": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 20, - "rocky-dvd-iso-x86_64-*-bios": 20 + "rocky-dvd-iso-x86_64-*-uefi": 20 }, "settings": { "BOOTFROM": "c", @@ -1734,7 +1742,7 @@ "slurm22": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 10, - "rocky-dvd-iso-x86_64-*-bios": 10 + "rocky-dvd-iso-x86_64-*-uefi": 10 }, "settings": { "BOOTFROM": "c", @@ -1749,7 +1757,7 @@ "slurm23": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 10, - "rocky-dvd-iso-x86_64-*-bios": 10 + "rocky-dvd-iso-x86_64-*-uefi": 10 }, "settings": { "BOOTFROM": "c", @@ -1764,9 +1772,9 @@ "support_server": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 10, - "rocky-dvd-iso-x86_64-*-bios": 10, + "rocky-dvd-iso-x86_64-*-uefi": 10, "rocky-universal-aarch64-*-aarch64": 10, - "rocky-universal-x86_64-*-bios": 10 + "rocky-universal-x86_64-*-uefi": 10 }, "settings": { "BOOTFROM": "c", @@ -1785,7 +1793,7 @@ "toolbox": { "profiles": { "rocky-dvd-iso-aarch64-*-aarch64": 10, - "rocky-dvd-iso-x86_64-*-bios": 10 + "rocky-dvd-iso-x86_64-*-uefi": 10 }, "settings": { "BOOTFROM": "c", diff --git a/tests/autocloud.pm b/tests/autocloud.pm index 087c5d2a..5de2b21d 100644 --- a/tests/autocloud.pm +++ b/tests/autocloud.pm @@ -19,16 +19,18 @@ sub run { # autocloud used to use, via tunir and this tunir config: # https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/autocloud/backend/files/fedora.txt?id=6e7c1b90593df8371fd34ed9484bd4da119236d3 my $self = shift; + # tests require python3 which is not default installed in Rocky 8 + if (get_version_major() < 9) { + assert_script_run("dnf install -y python3", timeout => 240); + } # we need to use script_run as regular user assert_script_run "chmod ugo+w /dev/" . $serialdev; # let's go to another tty and login as regular user send_key "alt-f2"; - console_login(user => "test", password => "weakpassword"); - assert_script_run "curl -O https://fedorapeople.org/groups/qa/tunirtests.tar.gz"; - assert_script_run "tar xvf tunirtests.tar.gz"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomic01Status -v"; + console_login(user => get_var("USER_LOGIN", "test"), password => get_var("USER_PASSWORD", "weakpassword")); + assert_script_run "curl -O https://openqa.rockylinux.org/qa/tunirtests.tar.gz"; + assert_script_run "tar -xvzf tunirtests.tar.gz"; _soft_fail_run "tunirtests.nongatingtests.TunirNonGatingtests"; - _soft_fail_run "tunirtests.nongatingtests.TunirNonGatingtestBzip2"; _soft_fail_run "tunirtests.nongatingtests.TunirNonGatingtestsCpio"; _soft_fail_run "tunirtests.nongatingtests.TunirNonGatingtestDiffutills"; _soft_fail_run "tunirtests.nongatingtests.TunirNonGatingtestaudit"; @@ -40,38 +42,30 @@ sub run { assert_script_run "sudo python3 -m unittest tunirtests.cloudtests.Testtmpmount -v"; assert_script_run "sudo python3 -m unittest tunirtests.cloudtests.Testnetname -v"; # this test only works properly as a regular user - _soft_fail_run "tunirtests.cloudtests.TestJournalWritten", 0; + #_soft_fail_run "tunirtests.cloudtests.TestJournalWritten", 0; assert_script_run "sudo python3 -m unittest tunirtests.cloudservice.TestServiceStop -v"; assert_script_run "sudo python3 -m unittest tunirtests.cloudservice.TestServiceDisable -v"; type_string "sudo reboot\n"; boot_to_login_screen(timeout => 180); - console_login(user => "root", password => "weakpassword"); + console_login(user => "root", password => get_var("USER_PASSWORD", "weakpassword")); # we need to use script_run as regular user again assert_script_run "sudo chmod ugo+w /dev/" . $serialdev; # let's go to another tty and login as regular user again send_key "alt-f2"; - console_login(user => "test", password => "weakpassword"); + console_login(user => get_var("USER_LOGIN", "test"), password => get_var("USER_PASSWORD", "weakpassword")); _soft_fail_run "tunirtests.testreboot.TestReboot"; assert_script_run "sudo python3 -m unittest tunirtests.cloudservice.TestServiceManipulation -v"; # this test only works properly as a regular user - _soft_fail_run "tunirtests.cloudtests.TestJournalWrittenAfterReboot", 0; + #_soft_fail_run "tunirtests.cloudtests.TestJournalWrittenAfterReboot", 0; type_string "sudo reboot\n"; boot_to_login_screen(timeout => 180); - console_login(user => "root", password => "weakpassword"); + console_login(user => "root", get_var("USER_PASSWORD", "weakpassword")); # we need to use script_run as regular user again assert_script_run "sudo chmod ugo+w /dev/" . $serialdev; # let's go to another tty and login as regular user again send_key "alt-f2"; - console_login(user => "test", password => "weakpassword"); + console_login(user => get_var("USER_LOGIN", "test"), password => get_var("USER_PASSWORD", "weakpassword")); assert_script_run "sudo python3 -m unittest tunirtests.cloudservice.TestServiceAfter -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerInstalled -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerStorageSetup -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicFirstBootRun -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicCommand -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestAtomicDockerImage -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestRootMount -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.Testreadonlymount -v"; - assert_script_run "sudo python3 -m unittest tunirtests.atomictests.TestDockerDaemon -v"; } diff --git a/tests/disk_custom_resize_lvm.pm b/tests/disk_custom_resize_lvm.pm index a78caa3e..49215d32 100644 --- a/tests/disk_custom_resize_lvm.pm +++ b/tests/disk_custom_resize_lvm.pm @@ -56,16 +56,14 @@ sub run { type_very_safely "/"; # Skip to the Size window send_key "tab"; - type_very_safely "12 GiB"; + type_very_safely "11.5 GiB"; # Reformat and update the partition assert_and_click "anaconda_part_device_reformat"; assert_and_click "anaconda_part_update_settings"; # give it a second or two to update wait_still_screen 2; - # Fedora original here as to resize to 13GiB but Rocky default / partition - # size is 12.5GiB and we can only resize down. - # Check that the partition has been resized for 12GiB - assert_screen "device_root_resized_twelve"; + # Check that the partition has been resized for 11.5GiB + assert_screen "device_root_resized_eleven_point_five"; # Add new /home partition into the emptied space. assert_and_click "anaconda_part_add"; diff --git a/tests/disk_custom_resize_lvm_postinstall.pm b/tests/disk_custom_resize_lvm_postinstall.pm index 475f9e08..42863dff 100644 --- a/tests/disk_custom_resize_lvm_postinstall.pm +++ b/tests/disk_custom_resize_lvm_postinstall.pm @@ -5,8 +5,9 @@ use testapi; sub run { assert_screen "root_console"; # check that there is a root partition and that it has - # the correct size -> 13G - assert_script_run "lsblk | grep root | grep '12G'"; + # the correct size -> 11.5G + script_run "lsblk"; + assert_script_run "lsblk | grep root | grep '11.5G'"; } sub test_flags { diff --git a/tests/uefi_postinstall.pm b/tests/uefi_postinstall.pm index 0ed19fad..5fe2445a 100644 --- a/tests/uefi_postinstall.pm +++ b/tests/uefi_postinstall.pm @@ -14,6 +14,7 @@ sub run { # this test shows if the system is booted with efi assert_script_run '[ -d /sys/firmware/efi/ ]'; # this test shows if the system is secure boot + script_run 'df;lsblk'; script_run 'mokutil --sb-state'; }