Skip to content

Commit

Permalink
Merge pull request os-autoinst#19265 from ricardobranco777/slem60_noc…
Browse files Browse the repository at this point in the history
…riupasst

containers: SL Micro 6.0 lacks criu, passt, podman-remote & python3 YAML module
  • Loading branch information
ricardobranco777 authored May 8, 2024
2 parents 1ccdf6f + f5f7a59 commit cee0e83
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions tests/containers/podman_integration.pm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use testapi;
use serial_terminal qw(select_serial_terminal);
use containers::utils qw(get_podman_version);
use utils qw(script_retry);
use version_utils qw(is_sle is_sle_micro is_tumbleweed is_microos is_leap is_leap_micro);
use version_utils qw(is_sle_micro is_tumbleweed is_microos);
use containers::common;
use Utils::Architectures qw(is_x86_64 is_aarch64);
use containers::bats qw(install_bats remove_mounts_conf switch_to_user delegate_controllers);
Expand Down Expand Up @@ -49,9 +49,12 @@ sub run {
install_bats;

# Install tests dependencies
my @pkgs = qw(aardvark-dns catatonit gpg2 jq make netavark netcat-openbsd openssl podman podman-remote python3-passlib python3-PyYAML skopeo socat sudo systemd-container);
my @pkgs = qw(aardvark-dns catatonit gpg2 jq make netavark netcat-openbsd openssl podman python3-passlib skopeo socat sudo systemd-container);
push @pkgs, qw(buildah) unless is_sle_micro;
push @pkgs, qw(criu passt) if (is_tumbleweed || is_microos || is_sle_micro('>=6.0') || is_leap_micro('>=6.0'));
# podman-remote is not yet available & python3-PyYAML was dropped in SLM 6.0
push @pkgs, qw(podman-remote python3-PyYAML) unless is_sle_micro('>=6.0');
# passt requires podman 5.0
push @pkgs, qw(criu passt) if (is_tumbleweed || is_microos);
# Needed for podman machine
if (is_x86_64) {
push @pkgs, "qemu-x86";
Expand Down

0 comments on commit cee0e83

Please sign in to comment.