Merge pull request #17629 from tinawang123/agama

Unify interactive installations in tests/yam/agama and its respective schedules
os-autoinst · Aug 28, 2023 · a469bd3 · a469bd3
2 parents f4064f1 + 88bf0c6
commit a469bd3
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 161 deletions.
diff --git a/lib/Yam/agama/agama_base.pm b/lib/Yam/agama/agama_base.pm
@@ -29,8 +29,6 @@ sub post_run_hook {
     reset_consoles;
     $testapi::username = "bernhard";
     $testapi::password = 'nots3cr3t';
-    select_serial_terminal();
-    ensure_serialdev_permissions;
 }
 
 sub test_flags {

diff --git a/schedule/yam/agama/agama_encrypted_lvm.yaml b/schedule/yam/agama/agama_encrypted_lvm.yaml
@@ -6,7 +6,7 @@ description: >
 schedule:
   - installation/bootloader_start
   - yam/agama/patch_agama
-  - yam/agama/agama_encrypted_lvm
+  - yam/agama/agama
   - installation/boot_encrypt
   - installation/first_boot
   - console/validate_encrypt

diff --git a/schedule/yam/agama/agama_full_disk_encryption.yaml b/schedule/yam/agama/agama_full_disk_encryption.yaml
@@ -5,7 +5,7 @@ description: >
 schedule:
   - installation/bootloader_start
   - yam/agama/patch_agama
-  - yam/agama/agama_full_disk_encryption
+  - yam/agama/agama
   - installation/boot_encrypt
   - installation/first_boot
   - console/validate_encrypt
diff --git a/schedule/yam/agama/agama_installation.yaml b/schedule/yam/agama/agama_installation.yaml
@@ -4,4 +4,6 @@ description: >
 schedule:
   - installation/bootloader_start
   - yam/agama/patch_agama
-  - yam/agama/agama_installation
+  - yam/agama/agama
+  - installation/grub_test
+  - installation/first_boot
diff --git a/schedule/yam/agama/agama_lvm.yaml b/schedule/yam/agama/agama_lvm.yaml
@@ -5,5 +5,7 @@ description: >
 schedule:
   - installation/bootloader_start
   - yam/agama/patch_agama
-  - yam/agama/agama_lvm
+  - yam/agama/agama
+  - installation/grub_test
+  - installation/first_boot
   - console/validate_lvm
diff --git a/tests/yam/agama/agama.pm b/tests/yam/agama/agama.pm
@@ -0,0 +1,25 @@
+## Copyright 2023 SUSE LLC
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Summary: Run interactive installation with Agama,
+# run playwright tests directly from the Live ISO.
+# Maintainer: QE YaST and Migration (QE Yam) <qe-yam at suse de>
+
+use base Yam::agama::agama_base;
+use strict;
+use warnings;
+
+use testapi qw(
+  assert_script_run
+  get_required_var
+  enter_cmd
+);
+
+sub run {
+    my $test = get_required_var('AGAMA_TEST');
+
+    assert_script_run("playwright test --trace on --project chromium --config /usr/share/e2e-agama-playwright tests/" . $test . ".spec.ts", timeout => 1200);
+    enter_cmd 'reboot';
+}
+
+1;
diff --git a/tests/yam/agama/agama_encrypted_lvm.pm b/tests/yam/agama/agama_encrypted_lvm.pm
diff --git a/tests/yam/agama/agama_full_disk_encryption.pm b/tests/yam/agama/agama_full_disk_encryption.pm
diff --git a/tests/yam/agama/agama_installation.pm b/tests/yam/agama/agama_installation.pm
diff --git a/tests/yam/agama/agama_lvm.pm b/tests/yam/agama/agama_lvm.pm
diff --git a/tests/yam/agama/patch_agama.pm b/tests/yam/agama/patch_agama.pm
@@ -16,8 +16,6 @@ sub run {
 
     my ($repo, $branch) = split /#/, get_required_var('YUPDATE_GIT');
     assert_script_run("yupdate patch $repo $branch", timeout => 60);
-
-    select_console 'installation';
 }
 
 1;