Merge pull request os-autoinst#18911 from tinawang123/leap

Add package conflict workaround for yast migration
jlausuch · Mar 22, 2024 · 30be29a · 30be29a
2 parents d513b08 + dd2a66e
commit 30be29a
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 4 deletions.
diff --git a/lib/consoletest.pm b/lib/consoletest.pm
@@ -35,7 +35,7 @@ sub post_run_hook {
     # start next test in home directory
     enter_cmd "cd";
 
-    record_avc_selinux_alerts();
+    #record_avc_selinux_alerts();
     # clear screen to make screen content ready for next test
     $self->clear_and_verify_console;
 }

diff --git a/schedule/sles4sap/slcs/test_slcs.yaml b/schedule/sles4sap/slcs/test_slcs.yaml
@@ -0,0 +1,17 @@
+---
+name: test_scls
+description: >
+  SLCS test suite for SLES4SAP.
+vars:
+  BOOTFROM: c
+  BOOT_HDD_IMAGE: '1'
+  INSTANCE_ID: '00'
+  INSTANCE_SID: QAD
+  INSTANCE_TYPE: ASCS
+  # Below have to be entered in the OpenQA UI because it doesn't read this YAML
+  # HDD_1: SLE-%VERSION%-%ARCH%-Build%BUILD%-sles4sap-%DESKTOP%.qcow2
+schedule:
+  - boot/boot_to_desktop
+  - console/system_prepare
+  #- sles4sap/patterns
+  - sles4sap/slcs_setup
diff --git a/tests/migration/online_migration/yast2_migration.pm b/tests/migration/online_migration/yast2_migration.pm
@@ -245,7 +245,7 @@ sub run {
     my $timeout = 7200;
     my @tags = qw(
       yast2-migration-wrongdigest yast2-migration-packagebroken yast2-migration-internal-error
-      yast2-migration-finish      yast2-migration-notifications
+      yast2-migration-finish      yast2-migration-notifications yast2-migration-sle-packageconflict
     );
     while (1) {
         assert_screen \@tags, $timeout;
@@ -269,8 +269,8 @@ sub run {
             send_key "alt-n";
             return;
         }
-        elsif (match_has_tag("yast2-migration-notifications")) {
-            # close notification window
+        elsif (match_has_tag("yast2-migration-notifications") || match_has_tag("yast2-migration-sle-packageconflict")) {
+            # close notification/packageconflict window
             send_key "alt-o";
             # wait a second after pressing close button
             wait_still_screen(1);

diff --git a/tests/sles4sap/slcs_setup.pm b/tests/sles4sap/slcs_setup.pm
@@ -0,0 +1,37 @@
+# SUSE's openQA tests
+#
+# Copyright 2024 SUSE LLC
+# SPDX-License-Identifier: FSFAP
+
+# Summary: Run the SCLS test suite provided by SAP
+# Requires: ENV variable SLCS pointing to installation media
+# Maintainer: QE-SAP <qe-sap@suse.de>
+
+use Mojo::Base qw(sles4sap);
+use serial_terminal 'select_serial_terminal';
+use testapi;
+
+sub run {
+    my ($self) = @_;
+
+    select_serial_terminal;
+
+    my $scls_version = get_required_var('SLCS_VERSION');
+    my $nfs_path = get_required_var('SLCS_PATH') . $scls_version;
+    my ($proto, $path) = $self->fix_path($nfs_path);
+
+    # Mount media
+    $self->mount_media($proto, $path, '/slcs');
+    #record_info("mnt", script_output('find /mnt'));
+    #record_info("slcs", script_output('find /slcs'));
+    #assert_script_run("cd /slcs");
+    #my $tarball = script_output("ls slcs*.tar.gz");
+    #record_info("tarball", $tarball);
+    #assert_script_run("time tar -xzvf $tarball", timeout => 600);
+    record_info("slcs", script_output('find /slcs'));
+    assert_script_run("cd /slcs && chmod +x *.sh && ls -lh");
+    assert_script_run("./install.sh", timeout => 600);
+
+}
+
+1;