Skip to content

Commit

Permalink
Merge pull request #20445 from ricardobranco777/nopasta
Browse files Browse the repository at this point in the history
containers: Don't install pasta if not available
  • Loading branch information
ricardobranco777 authored Oct 21, 2024
2 parents b7b98de + 020a69a commit 87fb0bd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions tests/containers/podman_integration.pm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use utils qw(script_retry);
use version_utils qw(is_sle 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 install_htpasswd install_ncat install_pasta patch_logfile remove_mounts_conf switch_to_user delegate_controllers enable_modules);
use containers::bats qw(install_bats install_htpasswd install_ncat patch_logfile remove_mounts_conf switch_to_user delegate_controllers enable_modules);

my $test_dir = "/var/tmp";
my $podman_version = "";
Expand Down Expand Up @@ -70,7 +70,6 @@ sub run {
install_packages(@pkgs);
install_htpasswd if is_sle_micro;
install_ncat;
install_pasta unless (is_tumbleweed || is_microos);

record_info("podman version", script_output("podman version"));

Expand Down

0 comments on commit 87fb0bd

Please sign in to comment.