From 695ffbc3512026ce1d1ada3ec599d4adcd5a59a6 Mon Sep 17 00:00:00 2001 From: Rainer Koenig Date: Thu, 4 Jul 2024 13:48:30 +0200 Subject: [PATCH] Reduce YAML files for guided_ext4 - Related ticket: https://progress.opensuse.org/issues/156028 --- .../test_cases/guided_ext4.yaml} | 12 ++------- .../sle/guided_ext4/guided_ext4_aarch64.yaml | 25 ------------------ .../guided_ext4/guided_ext4_s390x_kvm.yaml | 26 ------------------- .../guided_ext4/guided_ext4_s390x_zvm.yaml | 7 ++--- .../sle/guided_ext4/guided_ext4_svirt_pv.yaml | 25 ------------------ .../guided_ext4/guided_ext4_svirt_xen.yaml | 26 ------------------- .../sle/guided_ext4/guided_ext4_x86_64.yaml | 25 ------------------ 7 files changed, 4 insertions(+), 142 deletions(-) rename schedule/{yast/sle/guided_ext4/guided_ext4_pvm.yaml => yam/test_cases/guided_ext4.yaml} (67%) delete mode 100644 schedule/yast/sle/guided_ext4/guided_ext4_aarch64.yaml delete mode 100644 schedule/yast/sle/guided_ext4/guided_ext4_s390x_kvm.yaml delete mode 100644 schedule/yast/sle/guided_ext4/guided_ext4_svirt_pv.yaml delete mode 100644 schedule/yast/sle/guided_ext4/guided_ext4_svirt_xen.yaml delete mode 100644 schedule/yast/sle/guided_ext4/guided_ext4_x86_64.yaml diff --git a/schedule/yast/sle/guided_ext4/guided_ext4_pvm.yaml b/schedule/yam/test_cases/guided_ext4.yaml similarity index 67% rename from schedule/yast/sle/guided_ext4/guided_ext4_pvm.yaml rename to schedule/yam/test_cases/guided_ext4.yaml index 0c055fe18dcd..c1060713a41c 100644 --- a/schedule/yast/sle/guided_ext4/guided_ext4_pvm.yaml +++ b/schedule/yam/test_cases/guided_ext4.yaml @@ -1,10 +1,7 @@ --- -name: guided_ext4 -description: > +name: guided_ext4 +description: > Guided Partitioning installation with ext4 filesystem. -vars: - FILESYSTEM: ext4 - YUI_REST_API: 1 schedule: guided_partitioning: - installation/partitioning/select_guided_setup @@ -15,8 +12,3 @@ schedule: - console/validate_blockdevices - console/validate_free_space - console/validate_read_write -test_data: - guided_partitioning: - filesystem_options: - root_filesystem_type: ext4 - <<: !include test_data/yast/ext4/ext4_spvm.yaml diff --git a/schedule/yast/sle/guided_ext4/guided_ext4_aarch64.yaml b/schedule/yast/sle/guided_ext4/guided_ext4_aarch64.yaml deleted file mode 100644 index 4e33f3b51126..000000000000 --- a/schedule/yast/sle/guided_ext4/guided_ext4_aarch64.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: guided_ext4 -description: > - Guided Partitioning installation with ext4 filesystem. -vars: - FILESYSTEM: ext4 - YUI_REST_API: 1 -schedule: - extension_module_selection: - - installation/module_registration/register_module_desktop - system_role: - - installation/system_role/accept_selected_role_SLES_with_GNOME - guided_partitioning: - - installation/partitioning/select_guided_setup - - installation/partitioning/guided_setup/accept_default_part_scheme - - installation/partitioning/guided_setup/select_filesystem_option_ext4 - system_validation: - - console/validate_partition_table_via_blkid - - console/validate_blockdevices - - console/validate_free_space -test_data: - guided_partitioning: - filesystem_options: - root_filesystem_type: ext4 - <<: !include test_data/yast/ext4/ext4.yaml diff --git a/schedule/yast/sle/guided_ext4/guided_ext4_s390x_kvm.yaml b/schedule/yast/sle/guided_ext4/guided_ext4_s390x_kvm.yaml deleted file mode 100644 index 55d981ae951f..000000000000 --- a/schedule/yast/sle/guided_ext4/guided_ext4_s390x_kvm.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: guided_ext4 -description: > - Guided Partitioning installation with ext4 filesystem. -vars: - FILESYSTEM: ext4 - YUI_REST_API: 1 -schedule: - guided_partitioning: - - installation/partitioning/select_guided_setup - - installation/partitioning/guided_setup/accept_default_part_scheme - - installation/partitioning/guided_setup/select_filesystem_option_ext4 - extension_module_selection: - - installation/module_registration/register_module_desktop - system_role: - - installation/system_role/accept_selected_role_SLES_with_GNOME - system_validation: - - console/validate_partition_table_via_blkid - - console/validate_blockdevices - - console/validate_free_space - - console/validate_read_write -test_data: - guided_partitioning: - filesystem_options: - root_filesystem_type: ext4 - <<: !include test_data/yast/ext4/ext4_s390x.yaml diff --git a/schedule/yast/sle/guided_ext4/guided_ext4_s390x_zvm.yaml b/schedule/yast/sle/guided_ext4/guided_ext4_s390x_zvm.yaml index b17f3bd0d6b2..43b6baaee053 100644 --- a/schedule/yast/sle/guided_ext4/guided_ext4_s390x_zvm.yaml +++ b/schedule/yast/sle/guided_ext4/guided_ext4_s390x_zvm.yaml @@ -1,9 +1,8 @@ --- -name: guided_ext4 -description: > +name: guided_ext4 +description: > Guided Partitioning installation with ext4 filesystem. vars: - FILESYSTEM: ext4 YUI_REST_API: 1 schedule: guided_partitioning: @@ -13,5 +12,3 @@ schedule: system_validation: - console/validate_partition_table_via_parted - console/validate_blockdevices -test_data: - <<: !include test_data/yast/ext4/ext4_s390x-disk-activation.yaml diff --git a/schedule/yast/sle/guided_ext4/guided_ext4_svirt_pv.yaml b/schedule/yast/sle/guided_ext4/guided_ext4_svirt_pv.yaml deleted file mode 100644 index 7927d9754eae..000000000000 --- a/schedule/yast/sle/guided_ext4/guided_ext4_svirt_pv.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: guided_ext4 -description: > - Guided Partitioning installation with ext4 filesystem. -vars: - YUI_REST_API: 1 -schedule: - extension_module_selection: - - installation/module_registration/register_module_desktop - system_role: - - installation/system_role/accept_selected_role_SLES_with_GNOME - guided_partitioning: - - installation/partitioning/select_guided_setup - - installation/partitioning/guided_setup/accept_default_part_scheme - - installation/partitioning/guided_setup/select_filesystem_option_ext4 - system_validation: - - console/validate_partition_table_via_blkid - - console/validate_blockdevices - - console/validate_free_space - - console/validate_read_write -test_data: - guided_partitioning: - filesystem_options: - root_filesystem_type: ext4 - <<: !include test_data/yast/ext4/ext4_xen.yaml diff --git a/schedule/yast/sle/guided_ext4/guided_ext4_svirt_xen.yaml b/schedule/yast/sle/guided_ext4/guided_ext4_svirt_xen.yaml deleted file mode 100644 index 8915605466b7..000000000000 --- a/schedule/yast/sle/guided_ext4/guided_ext4_svirt_xen.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: guided_ext4 -description: > - Guided Partitioning installation with ext4 filesystem. -vars: - YUI_REST_API: 1 -schedule: - extension_module_selection: - - installation/module_registration/register_module_desktop - system_role: - - installation/system_role/accept_selected_role_SLES_with_GNOME - guided_partitioning: - - installation/partitioning/select_guided_setup - - installation/partitioning/guided_setup/accept_default_part_scheme - - installation/partitioning/guided_setup/select_filesystem_option_ext4 - stop_timeout_system_reboot: [] - system_validation: - - console/validate_partition_table_via_blkid - - console/validate_blockdevices - - console/validate_free_space - - console/validate_read_write -test_data: - guided_partitioning: - filesystem_options: - root_filesystem_type: ext4 - <<: !include test_data/yast/ext4/ext4_xen.yaml diff --git a/schedule/yast/sle/guided_ext4/guided_ext4_x86_64.yaml b/schedule/yast/sle/guided_ext4/guided_ext4_x86_64.yaml deleted file mode 100644 index 217c2bf83fc4..000000000000 --- a/schedule/yast/sle/guided_ext4/guided_ext4_x86_64.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: guided_ext4 -description: > - Guided Partitioning installation with ext4 filesystem. -vars: - FILESYSTEM: ext4 - YUI_REST_API: 1 -schedule: - extension_module_selection: - - installation/module_registration/register_module_desktop - system_role: - - installation/system_role/accept_selected_role_SLES_with_GNOME - guided_partitioning: - - installation/partitioning/select_guided_setup - - installation/partitioning/guided_setup/accept_default_part_scheme - - installation/partitioning/guided_setup/select_filesystem_option_ext4 - system_validation: - - console/validate_partition_table_via_blkid - - console/validate_blockdevices - - console/validate_free_space -test_data: - guided_partitioning: - filesystem_options: - root_filesystem_type: ext4 - <<: !include test_data/yast/ext4/ext4.yaml