Unify interactive installations in tests/yam/agama and its respective…

… schedules
os-autoinst · Aug 24, 2023 · d22b19c · d22b19c
1 parent 241c52f
commit d22b19c
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 6 deletions.
diff --git a/lib/Yam/agama/agama_base.pm b/lib/Yam/agama/agama_base.pm
@@ -14,6 +14,10 @@ use Utils::Logging 'save_and_upload_log';
 use utils 'ensure_serialdev_permissions';
 use serial_terminal qw(select_serial_terminal);
 
+our @EXPORT = qw(
+  set_password
+)
+
 sub pre_run_hook {
     $testapi::password = 'linux';
 }
@@ -33,6 +37,10 @@ sub post_run_hook {
     ensure_serialdev_permissions;
 }
 
+sub set_password {
+    $testapi::password = 'nots3cr3t';
+}
+
 sub test_flags {
     return {fatal => 1};
 }

diff --git a/schedule/yam/agama/agama_encrypted_lvm.yaml b/schedule/yam/agama/agama_encrypted_lvm.yaml
@@ -3,10 +3,12 @@ name: agama_dolomite_encrypted_lvm
 description: >
   Playwright test on agama dolomite for installation with fully encrypted disk,
   with LVM in use.
+vars:
+    AGAMA_TEST: 'encrypted_lvm'
 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
@@ -2,10 +2,12 @@
 name: agama_install_full_disk_encryption.yaml
 description: >
   Playwright test on agama
+vars:
+    AGAMA_TEST: 'full-disk-encryption'
 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
@@ -2,7 +2,9 @@
 name: agama_installation
 description: >
   Playwright test on agama
+vars:
+    AGAMA_TEST: 'take_screenshots'
 schedule:
   - installation/bootloader_start
   - yam/agama/patch_agama
-  - yam/agama/agama_installation
+  - yam/agama/agama
diff --git a/schedule/yam/agama/agama_lvm.yaml b/schedule/yam/agama/agama_lvm.yaml
@@ -2,8 +2,10 @@
 name: agama_lvm
 description: >
   Playwright use lvm test on agama
+vars:
+    AGAMA_TEST: 'lvm'
 schedule:
   - installation/bootloader_start
   - yam/agama/patch_agama
-  - yam/agama/agama_lvm
+  - yam/agama/agama
   - console/validate_lvm
diff --git a/tests/yam/agama/agama.pm b/tests/yam/agama/agama.pm
@@ -0,0 +1,48 @@
+## 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_screen
+  assert_script_run
+  select_console
+  get_required_var
+  upload_logs
+  match_has_tag
+  reset_consoles
+  get_var
+);
+
+sub run {
+    my $test = get_required_var('AGAMA_TEST');
+    my $cmd;
+    if ($test !~ /take_screenshots/) {
+        $cmd = 'PRODUCTNAME="' . get_required_var('AGAMA_PRODUCT') . '"';
+    } else {
+        $cmd = 'RUN_INSTALLATION=1';
+    }
+    assert_script_run($cmd . ' playwright test --trace on --project chromium --config /usr/share/e2e-agama-playwright tests/' . $test . '.spec.ts', timeout => 1200);
+
+    assert_script_run('reboot');
+    # For agama test, it is too short time to match the grub2, so we create
+    # a new needle to avoid too much needles loaded.
+    if (!get_var('ENCRYPT')) {
+       assert_screen('grub2-agama', 120);
+       my @tags = ("welcome-to", "login");
+       assert_screen(\@tags, 300);
+       reset_consoles;
+    }
+}
+
+sub post_fail_hook {
+    upload_logs("./test-results/agama/trace.zip");
+}
+
+1;
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;