From 3011743a084aac7b36f06a4343c60184fa208af5 Mon Sep 17 00:00:00 2001 From: rfan1 Date: Mon, 21 Oct 2024 18:42:48 -0400 Subject: [PATCH] Schedule salt smoke tests on micro-os https://progress.opensuse.org/issues/87982 --- lib/main_micro_alp.pm | 1 + tests/console/salt.pm | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/main_micro_alp.pm b/lib/main_micro_alp.pm index ed6dce7d6955..684e927aa440 100644 --- a/lib/main_micro_alp.pm +++ b/lib/main_micro_alp.pm @@ -205,6 +205,7 @@ sub load_common_tests { # Staging has no access to repos and the MicroOS-DVD does not contain ansible # Ansible test needs Packagehub in SLE and it can't be enabled in SLEM loadtest 'console/ansible' unless (is_staging || is_sle_micro || is_leap_micro); + loadtest 'console/salt' unless is_sle_micro; # On s390x zvm setups we need more time to wait for system to boot up. # Skip this test with sd-boot. The reason is not what you'd think though: # With sd-boot, host_config does not perform a reboot and a snapshot is made while the serial terminal diff --git a/tests/console/salt.pm b/tests/console/salt.pm index 02a3f5bd4801..88f4661568fa 100644 --- a/tests/console/salt.pm +++ b/tests/console/salt.pm @@ -24,8 +24,9 @@ use warnings; use testapi; use serial_terminal 'select_serial_terminal'; use utils qw(zypper_call quit_packagekit systemctl); -use version_utils qw(is_jeos is_opensuse is_sle is_leap is_community_jeos); +use version_utils qw(is_jeos is_opensuse is_sle is_leap is_community_jeos is_transactional); use registration 'add_suseconnect_product'; +use transactional qw(trup_call check_reboot_changes); sub run { select_serial_terminal; @@ -44,7 +45,13 @@ sub run { my @packages = qw(salt-master); # On SLE/Leap based Minimal-VM/Minimal-Image, salt-minion has to be preinstalled push @packages, 'salt-minion' unless is_jeos && (is_sle || is_leap) && !is_community_jeos; - zypper_call("in @packages"); + if (is_transactional) { + trup_call("pkg in @packages"); + check_reboot_changes; + } + else { + zypper_call("in @packages"); + } my $cmd = <<'EOF'; systemctl start salt-master systemctl status --no-pager salt-master