From 08a727adaa7c77f86c4d23ac208c1017a01c9c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Fern=C3=A1ndez=20Aguilera?= Date: Tue, 10 Sep 2024 12:32:26 +0200 Subject: [PATCH] Reduce yaml files for minimal+base_yast Reduce yaml files for minimal+base_yast Reduce yaml files for minimal+base_yast Change select patterns to select patterns from top Added new key in default scehdules Same fix for s390x-zVM --- .../test_cases/minimal+base_yast.yaml} | 17 +++---- .../minimal+base/minimal+base@s390x_zvm.yaml | 36 -------------- .../minimal+base@svirt-xen-hvm.yaml | 32 ------------- .../minimal+base/minimal+base@yast-s390x.yaml | 27 ----------- .../minimal+base@yast-svirt-hyperv.yaml | 24 ---------- .../minimal+base@yast-xen-pv.yaml | 40 ---------------- .../yast/minimal+base/minimal+base@yast.yaml | 48 ------------------- .../minimal+base@yast_aarch64.yaml | 26 ---------- .../minimal+base@yast_x86_64.yaml | 31 ------------ schedule/yast/sle/flows/default_aarch64.yaml | 1 + schedule/yast/sle/flows/default_ppc64le.yaml | 1 + .../yast/sle/flows/default_s390x_kvm.yaml | 1 + .../yast/sle/flows/default_s390x_zvm.yaml | 1 + .../yast/sle/flows/default_svirt-xen-hvm.yaml | 1 + .../yast/sle/flows/default_svirt-xen-pv.yaml | 1 + schedule/yast/sle/flows/default_x86_64.yaml | 1 + .../minimal+base_yast.yaml} | 0 test_data/yast/minimal+base_yast@s390x.yaml | 5 -- 18 files changed, 13 insertions(+), 280 deletions(-) rename schedule/{yast/minimal+base/minimal+base@pvm.yaml => yam/test_cases/minimal+base_yast.yaml} (77%) delete mode 100644 schedule/yast/minimal+base/minimal+base@s390x_zvm.yaml delete mode 100644 schedule/yast/minimal+base/minimal+base@svirt-xen-hvm.yaml delete mode 100644 schedule/yast/minimal+base/minimal+base@yast-s390x.yaml delete mode 100644 schedule/yast/minimal+base/minimal+base@yast-svirt-hyperv.yaml delete mode 100644 schedule/yast/minimal+base/minimal+base@yast-xen-pv.yaml delete mode 100644 schedule/yast/minimal+base/minimal+base@yast.yaml delete mode 100644 schedule/yast/minimal+base/minimal+base@yast_aarch64.yaml delete mode 100644 schedule/yast/minimal+base/minimal+base@yast_x86_64.yaml rename test_data/{yast/minimal_base_aarch64.yaml => yam/minimal+base_yast.yaml} (100%) delete mode 100644 test_data/yast/minimal+base_yast@s390x.yaml diff --git a/schedule/yast/minimal+base/minimal+base@pvm.yaml b/schedule/yam/test_cases/minimal+base_yast.yaml similarity index 77% rename from schedule/yast/minimal+base/minimal+base@pvm.yaml rename to schedule/yam/test_cases/minimal+base_yast.yaml index 2de8a7ffadf9..bf0a6daa0ad9 100644 --- a/schedule/yast/minimal+base/minimal+base@pvm.yaml +++ b/schedule/yam/test_cases/minimal+base_yast.yaml @@ -3,30 +3,25 @@ name: minimal+base@yast description: > Select a minimal textmode installation by starting with the default and unselecting all patterns except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - DESKTOP: textmode - PATTERNS: base,enhanced_base - YUI_REST_API: 1 + Sometimes grub is not displayed due to console reconnection. schedule: software: - installation/select_only_visible_patterns_from_top - security: + security_configuration: - installation/security/select_security_module_none system_preparation: - console/system_prepare + - console/prepare_test_data + - console/consoletest_setup + - console/force_scheduled_tasks system_validation: - console/installation_snapshots - console/zypper_lr - console/zypper_ref - console/ncurses + - console/glibc_sanity - update/zypper_up - console/zypper_lifecycle - console/orphaned_packages_check - console/validate_installed_patterns - console/consoletest_finish -test_data: - software: - patterns: - - base - - enhanced_base diff --git a/schedule/yast/minimal+base/minimal+base@s390x_zvm.yaml b/schedule/yast/minimal+base/minimal+base@s390x_zvm.yaml deleted file mode 100644 index 9352c9c2180c..000000000000 --- a/schedule/yast/minimal+base/minimal+base@s390x_zvm.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -name: minimal+base@s390x_zvm.yaml -description: > - Select a minimal textmode installation by starting with the default and unselecting - all patterns except for "base" and "enhanced_base". Not to be confused with - the new system role "minimal" introduced with SLE15. Requires disk activation - and grub is not displayed due to console reconnection. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - DESKTOP: textmode - PATTERNS: base,enhanced_base - YUI_REST_API: 1 -schedule: - software: - - installation/select_patterns - security: - - installation/security/select_security_module_none - - installation/installation_settings/validate_ssh_service_enabled - - installation/installation_settings/open_ssh_port - system_preparation: - - console/system_prepare - system_validation: - - console/installation_snapshots - - console/zypper_lr - - console/zypper_ref - - console/ncurses - - update/zypper_up - - console/zypper_lifecycle - - console/orphaned_packages_check - - console/validate_installed_patterns - - console/consoletest_finish -test_data: - software: - patterns: - - base - - enhanced_base diff --git a/schedule/yast/minimal+base/minimal+base@svirt-xen-hvm.yaml b/schedule/yast/minimal+base/minimal+base@svirt-xen-hvm.yaml deleted file mode 100644 index 78eed66a5e75..000000000000 --- a/schedule/yast/minimal+base/minimal+base@svirt-xen-hvm.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: minimal+base@yast -description: > - Select a minimal textmode installation by starting with the default and unselecting all patterns - except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - DESKTOP: textmode - PATTERNS: base,enhanced_base - YUI_REST_API: 1 -schedule: - software: - - installation/select_patterns - security: - - installation/security/select_security_module_none - system_preparation: - - console/system_prepare - system_validation: - - console/installation_snapshots - - console/zypper_lr - - console/zypper_ref - - console/ncurses - - update/zypper_up - - console/zypper_lifecycle - - console/orphaned_packages_check - - console/validate_installed_patterns - - console/consoletest_finish -test_data: - software: - patterns: - - base - - enhanced_base diff --git a/schedule/yast/minimal+base/minimal+base@yast-s390x.yaml b/schedule/yast/minimal+base/minimal+base@yast-s390x.yaml deleted file mode 100644 index 80661b8dfb96..000000000000 --- a/schedule/yast/minimal+base/minimal+base@yast-s390x.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: minimal+base@yast-s390x -description: > - Select a minimal textmode installation by starting with the default and unselecting all patterns - except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. - Grub is not displayed due to console reconnection. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - PATTERNS: base,enhanced_base - YUI_REST_API: 1 -schedule: - software: - - installation/select_patterns - security: - - installation/security/select_security_module_none - system_preparation: - - console/system_prepare - system_validation: - - console/installation_snapshots - - console/zypper_lr - - console/zypper_ref - - console/ncurses - - update/zypper_up - - console/zypper_lifecycle - - console/orphaned_packages_check - - console/validate_installed_patterns - - console/consoletest_finish diff --git a/schedule/yast/minimal+base/minimal+base@yast-svirt-hyperv.yaml b/schedule/yast/minimal+base/minimal+base@yast-svirt-hyperv.yaml deleted file mode 100644 index 8a40bb74ead2..000000000000 --- a/schedule/yast/minimal+base/minimal+base@yast-svirt-hyperv.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: minimal+base@yast-svirt-hyperv -description: > - Select a minimal textmode installation by starting with the default and unselecting all patterns - except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. - It cannot access installation shell therefore it does not schedule module 'logs_from_installation_system'. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - DESKTOP: textmode - PATTERNS: base,enhanced_base - YUI_REST_API: 1 -schedule: - software: - - installation/select_patterns - security: - - installation/installation_settings/validate_ssh_service_enabled - - installation/installation_settings/open_ssh_port - - installation/security/select_security_module_none - installation_logs: [] -test_data: - software: - patterns: - - base - - enhanced_base diff --git a/schedule/yast/minimal+base/minimal+base@yast-xen-pv.yaml b/schedule/yast/minimal+base/minimal+base@yast-xen-pv.yaml deleted file mode 100644 index ce60bc10d503..000000000000 --- a/schedule/yast/minimal+base/minimal+base@yast-xen-pv.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -name: minimal+base@yast-xen-pv -description: > - Select a minimal textmode installation by starting with the default and unselecting all patterns - except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. - Test modules 'grub_disable_timeout' and 'grub_test' in xen-pv are not scheduled - due to grub2 doesn't support xfb console. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - DESKTOP: textmode - PATTERNS: base,enhanced_base - YUI_REST_API: 1 -schedule: - software: - - installation/select_only_visible_patterns_from_top - default_systemd_target: - - installation/installation_settings/validate_default_target - security: - - installation/security/select_security_module_none - system_preparation: - - console/system_prepare - - console/prepare_test_data - - console/consoletest_setup - - console/force_scheduled_tasks - system_validation: - - console/installation_snapshots - - console/zypper_lr - - console/zypper_ref - - console/ncurses - - console/glibc_sanity - - update/zypper_up - - console/zypper_lifecycle - - console/orphaned_packages_check - - console/validate_installed_patterns - - console/consoletest_finish -test_data: - software: - patterns: - - base - - enhanced_base diff --git a/schedule/yast/minimal+base/minimal+base@yast.yaml b/schedule/yast/minimal+base/minimal+base@yast.yaml deleted file mode 100644 index c8970dcd5ffc..000000000000 --- a/schedule/yast/minimal+base/minimal+base@yast.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -name: minimal+base@yast -description: > - Select a minimal textmode installation by starting with the default and unselecting all patterns - except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - DESKTOP: textmode - PATTERNS: base,enhanced_base - 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/accept_proposed_layout - - installation/clock_and_timezone/accept_timezone_configuration - - installation/authentication/use_same_password_for_root - - installation/authentication/default_user_simple_pwd - - installation/select_only_visible_patterns_from_top - - installation/bootloader_settings/disable_boot_menu_timeout - - installation/security/select_security_module_none - - installation/launch_installation - - installation/confirm_installation - - installation/performing_installation/perform_installation - - installation/logs_from_installation_system - - installation/performing_installation/confirm_reboot - - installation/handle_reboot - - installation/first_boot - - console/system_prepare - - console/installation_snapshots - - console/zypper_lr - - console/zypper_ref - - console/ncurses - - update/zypper_up - - console/zypper_lifecycle - - console/orphaned_packages_check - - console/validate_installed_patterns - - console/consoletest_finish -test_data: - software: - patterns: - - base - - enhanced_base diff --git a/schedule/yast/minimal+base/minimal+base@yast_aarch64.yaml b/schedule/yast/minimal+base/minimal+base@yast_aarch64.yaml deleted file mode 100644 index 9ed4b5feb92d..000000000000 --- a/schedule/yast/minimal+base/minimal+base@yast_aarch64.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: minimal+base@yast -description: > - Select a minimal textmode installation by starting with the default and unselecting all patterns - except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. -vars: - DEPENDENCY_RESOLVER_FLAG: 1 - DESKTOP: textmode - PATTERNS: base,enhanced_base - YUI_REST_API: 1 -schedule: - software: - - installation/select_only_visible_patterns_from_top - security: - - installation/security/select_security_module_none - system_validation: - - console/system_prepare - - console/installation_snapshots - - console/zypper_lr - - console/zypper_ref - - console/ncurses - - update/zypper_up - - console/zypper_lifecycle - - console/orphaned_packages_check - - console/validate_installed_patterns - - console/consoletest_finish diff --git a/schedule/yast/minimal+base/minimal+base@yast_x86_64.yaml b/schedule/yast/minimal+base/minimal+base@yast_x86_64.yaml deleted file mode 100644 index 490d58d11787..000000000000 --- a/schedule/yast/minimal+base/minimal+base@yast_x86_64.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: minimal+base@yast -description: > - Select a minimal textmode installation by starting with the default and unselecting all patterns - except for "base" and "minimal". Not to be confused with the new system role "minimal" introduced with SLE15. -vars: - DESKTOP: textmode - PATTERNS: base,enhanced_base - YUI_REST_API: 1 -schedule: - software: - - installation/select_only_visible_patterns_from_top - security: - - installation/security/select_security_module_none - system_preparation: - - console/system_prepare - system_validation: - - console/installation_snapshots - - console/zypper_lr - - console/zypper_ref - - console/ncurses - - update/zypper_up - - console/zypper_lifecycle - - console/orphaned_packages_check - - console/validate_installed_patterns - - console/consoletest_finish -test_data: - software: - patterns: - - base - - enhanced_base diff --git a/schedule/yast/sle/flows/default_aarch64.yaml b/schedule/yast/sle/flows/default_aarch64.yaml index ca46ccb39453..0e171bc093ac 100644 --- a/schedule/yast/sle/flows/default_aarch64.yaml +++ b/schedule/yast/sle/flows/default_aarch64.yaml @@ -38,6 +38,7 @@ software: [] booting: - installation/bootloader_settings/disable_boot_menu_timeout security: [] +security_configuration: [] default_systemd_target: [] installation_settings: - installation/launch_installation diff --git a/schedule/yast/sle/flows/default_ppc64le.yaml b/schedule/yast/sle/flows/default_ppc64le.yaml index d898b8ffae32..de0d19de9d69 100644 --- a/schedule/yast/sle/flows/default_ppc64le.yaml +++ b/schedule/yast/sle/flows/default_ppc64le.yaml @@ -35,6 +35,7 @@ booting: - installation/bootloader_settings/disable_plymouth - installation/bootloader_settings/disable_boot_menu_timeout security: [] +security_configuration: [] default_systemd_target: [] installation_settings: - installation/installation_settings/validate_ssh_service_enabled diff --git a/schedule/yast/sle/flows/default_s390x_kvm.yaml b/schedule/yast/sle/flows/default_s390x_kvm.yaml index 39dfb1c5ca08..ab60f28a034f 100644 --- a/schedule/yast/sle/flows/default_s390x_kvm.yaml +++ b/schedule/yast/sle/flows/default_s390x_kvm.yaml @@ -33,6 +33,7 @@ software: [] booting: - installation/bootloader_settings/disable_boot_menu_timeout security: [] +security_configuration: [] default_systemd_target: [] installation_settings: - installation/installation_settings/validate_ssh_service_enabled diff --git a/schedule/yast/sle/flows/default_s390x_zvm.yaml b/schedule/yast/sle/flows/default_s390x_zvm.yaml index b445094b37c5..f9d7565e0525 100644 --- a/schedule/yast/sle/flows/default_s390x_zvm.yaml +++ b/schedule/yast/sle/flows/default_s390x_zvm.yaml @@ -39,6 +39,7 @@ booting: security: - installation/installation_settings/validate_ssh_service_enabled - installation/installation_settings/open_ssh_port +security_configuration: [] default_systemd_target: [] installation_settings: - installation/launch_installation diff --git a/schedule/yast/sle/flows/default_svirt-xen-hvm.yaml b/schedule/yast/sle/flows/default_svirt-xen-hvm.yaml index 77bbbe084a0f..d55349372f51 100644 --- a/schedule/yast/sle/flows/default_svirt-xen-hvm.yaml +++ b/schedule/yast/sle/flows/default_svirt-xen-hvm.yaml @@ -32,6 +32,7 @@ booting: - installation/bootloader_settings/disable_boot_menu_timeout default_systemd_target: [] security: [] +security_configuration: [] installation_settings: - installation/installation_settings/validate_ssh_service_enabled - installation/installation_settings/open_ssh_port diff --git a/schedule/yast/sle/flows/default_svirt-xen-pv.yaml b/schedule/yast/sle/flows/default_svirt-xen-pv.yaml index afcb5c90c4a4..464eefdf39bf 100644 --- a/schedule/yast/sle/flows/default_svirt-xen-pv.yaml +++ b/schedule/yast/sle/flows/default_svirt-xen-pv.yaml @@ -31,6 +31,7 @@ software: [] booting: [] default_systemd_target: [] security: [] +security_configuration: [] installation_settings: - installation/installation_settings/validate_ssh_service_enabled - installation/installation_settings/open_ssh_port diff --git a/schedule/yast/sle/flows/default_x86_64.yaml b/schedule/yast/sle/flows/default_x86_64.yaml index 533509f93d0e..99e623169762 100644 --- a/schedule/yast/sle/flows/default_x86_64.yaml +++ b/schedule/yast/sle/flows/default_x86_64.yaml @@ -39,6 +39,7 @@ software: [] booting: - installation/bootloader_settings/disable_boot_menu_timeout security: [] +security_configuration: [] default_systemd_target: [] installation_settings: - installation/launch_installation diff --git a/test_data/yast/minimal_base_aarch64.yaml b/test_data/yam/minimal+base_yast.yaml similarity index 100% rename from test_data/yast/minimal_base_aarch64.yaml rename to test_data/yam/minimal+base_yast.yaml diff --git a/test_data/yast/minimal+base_yast@s390x.yaml b/test_data/yast/minimal+base_yast@s390x.yaml deleted file mode 100644 index 7baa3fd016f3..000000000000 --- a/test_data/yast/minimal+base_yast@s390x.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -software: - patterns: - - base - - enhanced_base