Merge pull request os-autoinst#20157 from okynos/163253-reduce-minima…

…l-base-yast Reduce yaml files for minimal+base_yast
coolgw · Oct 20, 2024 · 67bae93 · 67bae93
2 parents 4aa0a39 + 08a727a
commit 67bae93
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 280 deletions.
diff --git a/...e/yast/minimal+base/[email protected] → ...ule/yam/test_cases/minimal+base_yast.yaml b/...e/yast/minimal+base/[email protected] → ...ule/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
diff --git a/schedule/yast/minimal+base/[email protected] b/schedule/yast/minimal+base/[email protected]
diff --git a/schedule/yast/minimal+base/[email protected] b/schedule/yast/minimal+base/[email protected]
diff --git a/schedule/yast/minimal+base/[email protected] b/schedule/yast/minimal+base/[email protected]
diff --git a/schedule/yast/minimal+base/[email protected] b/schedule/yast/minimal+base/[email protected]
diff --git a/schedule/yast/minimal+base/[email protected] b/schedule/yast/minimal+base/[email protected]
diff --git a/schedule/yast/minimal+base/minimal+base@yast_aarch64.yaml b/schedule/yast/minimal+base/minimal+base@yast_aarch64.yaml
diff --git a/schedule/yast/minimal+base/minimal+base@yast_x86_64.yaml b/schedule/yast/minimal+base/minimal+base@yast_x86_64.yaml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → test_data/yam/minimal+base_yast.yaml b/test_data/yast/minimal_base_aarch64.yaml → test_data/yam/minimal+base_yast.yaml
diff --git a/test_data/yast/[email protected] b/test_data/yast/[email protected]