From 268ea47acf43a06f14c0d85e69023d3b5055e093 Mon Sep 17 00:00:00 2001 From: "Huajian.Luo" Date: Tue, 5 Nov 2024 14:45:16 +0800 Subject: [PATCH] Reduce yaml files for raid scenarios --- schedule/yam/test_cases/raid_sle_gpt.yaml | 4 +- .../yast/raid/raid0_sle_gpt_prep_boot.yaml | 38 ------ .../raid/raid0_sle_gpt_prep_boot_pvm.yaml | 67 ---------- .../yast/raid/raid10_sle_gpt_prep_boot.yaml | 38 ------ schedule/yast/raid/raid10_sle_gpt_uefi.yaml | 38 ------ .../yast/raid/raid1_sle_gpt_prep_boot.yaml | 38 ------ schedule/yast/raid/raid1_sle_gpt_uefi.yaml | 116 ----------------- .../yast/raid/raid5_sle_gpt_prep_boot.yaml | 38 ------ schedule/yast/raid/raid5_sle_gpt_uefi.yaml | 38 ------ .../yast/raid/raid6_sle_gpt_prep_boot.yaml | 38 ------ schedule/yast/raid/raid6_sle_gpt_uefi.yaml | 119 ------------------ .../raid/raid0_prep_boot_test_data_pvm.yaml | 47 +++++++ 12 files changed, 49 insertions(+), 570 deletions(-) delete mode 100644 schedule/yast/raid/raid0_sle_gpt_prep_boot.yaml delete mode 100644 schedule/yast/raid/raid0_sle_gpt_prep_boot_pvm.yaml delete mode 100644 schedule/yast/raid/raid10_sle_gpt_prep_boot.yaml delete mode 100644 schedule/yast/raid/raid10_sle_gpt_uefi.yaml delete mode 100644 schedule/yast/raid/raid1_sle_gpt_prep_boot.yaml delete mode 100644 schedule/yast/raid/raid1_sle_gpt_uefi.yaml delete mode 100644 schedule/yast/raid/raid5_sle_gpt_prep_boot.yaml delete mode 100644 schedule/yast/raid/raid5_sle_gpt_uefi.yaml delete mode 100644 schedule/yast/raid/raid6_sle_gpt_prep_boot.yaml delete mode 100644 schedule/yast/raid/raid6_sle_gpt_uefi.yaml create mode 100644 test_data/yast/raid/raid0_prep_boot_test_data_pvm.yaml diff --git a/schedule/yam/test_cases/raid_sle_gpt.yaml b/schedule/yam/test_cases/raid_sle_gpt.yaml index 2528f892b567..396be8f5815a 100644 --- a/schedule/yam/test_cases/raid_sle_gpt.yaml +++ b/schedule/yam/test_cases/raid_sle_gpt.yaml @@ -1,8 +1,8 @@ name: RAID_gpt description: > - Configure RAID 5/6/10 on the disks with GPT partition tables using Expert Partitioner. + Configure RAID 1/5/6/10 on the disks with GPT partition tables using Expert Partitioner. Creates BIOS boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 5/6/10. + them for RAID 1/5/6/10. schedule: suggested_partitioning: - installation/partitioning/raid_gpt diff --git a/schedule/yast/raid/raid0_sle_gpt_prep_boot.yaml b/schedule/yast/raid/raid0_sle_gpt_prep_boot.yaml deleted file mode 100644 index 60f4d8d79625..000000000000 --- a/schedule/yast/raid/raid0_sle_gpt_prep_boot.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: RAID0_gpt_uefi -description: > - Configure RAID 0 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates PReP boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 0. -vars: - RAIDLEVEL: 0 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - <<: !include test_data/yast/raid/raid0_prep_boot.yaml diff --git a/schedule/yast/raid/raid0_sle_gpt_prep_boot_pvm.yaml b/schedule/yast/raid/raid0_sle_gpt_prep_boot_pvm.yaml deleted file mode 100644 index e388ac4812c4..000000000000 --- a/schedule/yast/raid/raid0_sle_gpt_prep_boot_pvm.yaml +++ /dev/null @@ -1,67 +0,0 @@ -name: RAID0_gpt -description: > - Configure RAID 0 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates PReP boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 0 for root, RAID 1 for /boot and RAID 0 for swap. - For pvm we have to disable plymouth, so edit_optional_kernel_cmd_parameters - module is scheduled and OPT_KERNEL_PARAMS variable is set. -vars: - RAIDLEVEL: 0 - DESKTOP: textmode - OPT_KERNEL_PARAMS: console=%SERIALDEV% VNCSize=1024x768 - YUI_REST_API: 1 -schedule: - expert_partitioning: - - installation/partitioning/raid_gpt - suggested_partitioning: [] - system_validation: - - console/validate_md_raid - - console/validate_raid -test_data: - # We have same partitioning layout for all raid tests, except mds - <<: !include test_data/yast/raid/raid_prep_boot_test_data_pvm.yaml - mds: - - raid_level: 0 - name: md0 - chunk_size: '64 KiB' - devices: - - sda2 - - sdb2 - - sdc2 - - sdd2 - partition: - role: operating-system - formatting_options: - should_format: 1 - mounting_options: - should_mount: 1 - - raid_level: 1 - name: md1 - devices: - - sda3 - - sdb3 - - sdc3 - - sdd3 - partition: - role: data - formatting_options: - should_format: 1 - filesystem: ext4 - mounting_options: - should_mount: 1 - mount_point: '/boot' - - raid_level: 0 - name: md2 - chunk_size: '64 KiB' - devices: - - sda4 - - sdb4 - - sdc4 - - sdd4 - partition: - role: swap - formatting_options: - should_format: 1 - filesystem: swap - mounting_options: - should_mount: 1 diff --git a/schedule/yast/raid/raid10_sle_gpt_prep_boot.yaml b/schedule/yast/raid/raid10_sle_gpt_prep_boot.yaml deleted file mode 100644 index 406e113ea41f..000000000000 --- a/schedule/yast/raid/raid10_sle_gpt_prep_boot.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: RAID10_gpt_uefi -description: > - Configure RAID 10 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates PReP boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 10. -vars: - RAIDLEVEL: 10 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - <<: !include test_data/yast/raid/raid10_prep_boot.yaml diff --git a/schedule/yast/raid/raid10_sle_gpt_uefi.yaml b/schedule/yast/raid/raid10_sle_gpt_uefi.yaml deleted file mode 100644 index e1e57004f268..000000000000 --- a/schedule/yast/raid/raid10_sle_gpt_uefi.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: RAID10_gpt_uefi -description: > - Configure RAID 10 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates EFI boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 10. -vars: - RAIDLEVEL: 10 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - <<: !include test_data/yast/raid/raid10_gpt_uefi_test_data.yaml diff --git a/schedule/yast/raid/raid1_sle_gpt_prep_boot.yaml b/schedule/yast/raid/raid1_sle_gpt_prep_boot.yaml deleted file mode 100644 index c3f357664dd9..000000000000 --- a/schedule/yast/raid/raid1_sle_gpt_prep_boot.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: RAID1_gpt_uefi -description: > - Configure RAID 1 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates PReP boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 1. -vars: - RAIDLEVEL: 1 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - <<: !include test_data/yast/raid/raid1_prep_boot.yaml diff --git a/schedule/yast/raid/raid1_sle_gpt_uefi.yaml b/schedule/yast/raid/raid1_sle_gpt_uefi.yaml deleted file mode 100644 index f086b0fb350c..000000000000 --- a/schedule/yast/raid/raid1_sle_gpt_uefi.yaml +++ /dev/null @@ -1,116 +0,0 @@ -name: RAID1_gpt_uefi -description: > - Configure RAID 1 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates EFI boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 1. -vars: - RAIDLEVEL: 1 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - disks: - - name: vda - partitions: - - size: 300mb - role: raw-volume - formatting_options: - should_format: 1 - filesystem: fat - mounting_options: - should_mount: 1 - mount_point: '/boot/efi' - - size: 12500mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - - name: vdb - partitions: - - size: 300mb - role: raw-volume - id: efi - - size: 12500mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - - name: vdc - partitions: - - size: 300mb - role: raw-volume - id: efi - - size: 12500mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - - name: vdd - partitions: - - size: 300mb - role: raw-volume - id: efi - - size: 12500mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - mds: - - raid_level: 1 - name: md0 - devices: - - vda2 - - vdb2 - - vdc2 - - vdd2 - partition: - role: operating-system - formatting_options: - should_format: 1 - mounting_options: - should_mount: 1 - - raid_level: 0 - name: md1 - chunk_size: '64 KiB' - devices: - - vda3 - - vdb3 - - vdc3 - - vdd3 - partition: - role: swap - formatting_options: - should_format: 1 - filesystem: swap - mounting_options: - should_mount: 1 diff --git a/schedule/yast/raid/raid5_sle_gpt_prep_boot.yaml b/schedule/yast/raid/raid5_sle_gpt_prep_boot.yaml deleted file mode 100644 index 60e3bea95aca..000000000000 --- a/schedule/yast/raid/raid5_sle_gpt_prep_boot.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: RAID5_gpt_uefi -description: > - Configure RAID 5 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates PReP boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 5. -vars: - RAIDLEVEL: 5 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - <<: !include test_data/yast/raid/raid5_prep_boot.yaml diff --git a/schedule/yast/raid/raid5_sle_gpt_uefi.yaml b/schedule/yast/raid/raid5_sle_gpt_uefi.yaml deleted file mode 100644 index 93326617c385..000000000000 --- a/schedule/yast/raid/raid5_sle_gpt_uefi.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: RAID5_gpt_uefi -description: > - Configure RAID 5 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates EFI boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 5. -vars: - RAIDLEVEL: 5 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - <<: !include test_data/yast/raid/raid5_gpt_uefi_test_data.yaml diff --git a/schedule/yast/raid/raid6_sle_gpt_prep_boot.yaml b/schedule/yast/raid/raid6_sle_gpt_prep_boot.yaml deleted file mode 100644 index cf580b10fb01..000000000000 --- a/schedule/yast/raid/raid6_sle_gpt_prep_boot.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: RAID6_gpt_uefi -description: > - Configure RAID 6 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates PReP boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 6. -vars: - RAIDLEVEL: 6 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - <<: !include test_data/yast/raid/raid6_prep_boot.yaml diff --git a/schedule/yast/raid/raid6_sle_gpt_uefi.yaml b/schedule/yast/raid/raid6_sle_gpt_uefi.yaml deleted file mode 100644 index 44a4484d09e6..000000000000 --- a/schedule/yast/raid/raid6_sle_gpt_uefi.yaml +++ /dev/null @@ -1,119 +0,0 @@ -name: RAID6_gpt_uefi -description: > - Configure RAID 6 on the disks with GPT partition tables and UEFI using Expert Partitioner. - Creates EFI boot, root and swap partitions on each of the 4 disks and then uses - them for RAID 6. -vars: - RAIDLEVEL: 6 - YUI_REST_API: 1 -schedule: - - installation/bootloader_start - - installation/setup_libyui - - installation/product_selection/install_SLES - - installation/licensing/accept_license - - installation/registration/register_via_scc - - installation/module_registration/skip_module_registration - - installation/add_on_product/skip_install_addons - - installation/system_role/accept_selected_role_text_mode - - installation/partitioning/raid_gpt - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/installation_settings/validate_default_target - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/grub_test - - installation/first_boot - - console/hostname - - console/system_prepare - - console/force_scheduled_tasks - - shutdown/grub_set_bootargs - - console/validate_md_raid - - console/validate_raid -test_data: - disks: - - name: vda - partitions: - - size: 300mb - role: raw-volume - formatting_options: - should_format: 1 - filesystem: fat - mounting_options: - should_mount: 1 - mount_point: '/boot/efi' - - size: 8000mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - - name: vdb - partitions: - - size: 300mb - role: raw-volume - id: efi - - size: 8000mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - - name: vdc - partitions: - - size: 300mb - role: raw-volume - id: efi - - size: 8000mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - - name: vdd - partitions: - - size: 300mb - role: raw-volume - id: efi - - size: 8000mb - role: raw-volume - id: linux-raid - - size: 100mb - role: raw-volume - id: linux-raid - mds: - - raid_level: 6 - name: md0 - chunk_size: '64 KiB' - devices: - - vda2 - - vdb2 - - vdc2 - - vdd2 - device_selection_step: 2 - partition: - role: operating-system - formatting_options: - should_format: 1 - mounting_options: - should_mount: 1 - - raid_level: 0 - name: md1 - chunk_size: '64 KiB' - devices: - - vda3 - - vdb3 - - vdc3 - - vdd3 - device_selection_step: 1 - partition: - role: operating-system - formatting_options: - should_format: 1 - filesystem: swap - mounting_options: - should_mount: 1 diff --git a/test_data/yast/raid/raid0_prep_boot_test_data_pvm.yaml b/test_data/yast/raid/raid0_prep_boot_test_data_pvm.yaml new file mode 100644 index 000000000000..d88cd6afca79 --- /dev/null +++ b/test_data/yast/raid/raid0_prep_boot_test_data_pvm.yaml @@ -0,0 +1,47 @@ +# We have same partitioning layout for all raid tests, except mds +<<: !include test_data/yast/raid/raid_prep_boot_test_data_pvm.yaml +mds: + - raid_level: 0 + name: md0 + chunk_size: '64 KiB' + devices: + - sda2 + - sdb2 + - sdc2 + - sdd2 + partition: + role: operating-system + formatting_options: + should_format: 1 + mounting_options: + should_mount: 1 + - raid_level: 1 + name: md1 + devices: + - sda3 + - sdb3 + - sdc3 + - sdd3 + partition: + role: data + formatting_options: + should_format: 1 + filesystem: ext4 + mounting_options: + should_mount: 1 + mount_point: '/boot' + - raid_level: 0 + name: md2 + chunk_size: '64 KiB' + devices: + - sda4 + - sdb4 + - sdc4 + - sdd4 + partition: + role: swap + formatting_options: + should_format: 1 + filesystem: swap + mounting_options: + should_mount: 1