From 72f825789341929d5e47e5229b7496d8ca04cda1 Mon Sep 17 00:00:00 2001 From: mloviska Date: Wed, 13 Dec 2023 16:32:16 +0100 Subject: [PATCH] Netavark is default it sle-micro 6.0 Do not install nor switch to netavark as it is the default setup in sle-micro 6.0 --- lib/main_containers.pm | 2 +- tests/containers/podman_netavark.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/main_containers.pm b/lib/main_containers.pm index fcde1054d259..9dd3be3783f0 100644 --- a/lib/main_containers.pm +++ b/lib/main_containers.pm @@ -102,7 +102,7 @@ sub load_host_tests_podman { loadtest 'containers/podman_bci_systemd'; loadtest 'containers/podman_pods'; # Default for ALP is Netavark - loadtest('containers/podman_network_cni') unless (is_alp); + loadtest('containers/podman_network_cni') unless (is_alp || is_sle_micro('6.0+')); # Netavark not supported in 15-SP1 and 15-SP2 (due to podman version older than 4.0.0) loadtest 'containers/podman_netavark' unless (is_staging || is_sle("<15-sp3") || is_ppc64le); # Firewall is not installed in JeOS OpenStack, MicroOS and Public Cloud images diff --git a/tests/containers/podman_netavark.pm b/tests/containers/podman_netavark.pm index c5dc298d7bbb..cb1fcc083e94 100644 --- a/tests/containers/podman_netavark.pm +++ b/tests/containers/podman_netavark.pm @@ -10,7 +10,7 @@ use Mojo::Base 'containers::basetest'; use testapi; use serial_terminal qw(select_serial_terminal); -use version_utils qw(package_version_cmp is_transactional is_jeos is_alp); +use version_utils qw(package_version_cmp is_transactional is_jeos is_alp is_sle_micro); use containers::utils qw(get_podman_version registry_url); use transactional qw(trup_call check_reboot_changes); use utils qw(zypper_call); @@ -76,7 +76,7 @@ sub run { return 1; } - switch_to_netavark unless is_alp; + switch_to_netavark unless (is_alp || is_sle_micro('6.0+')); $podman->cleanup_system_host(); ## TEST1