Skip to content

Commit 61e8de3

Browse files
Merge pull request #25207 from ricardobranco777/podmane2e
Fix silently skipped podman_e2e tests
2 parents 7a4a044 + 4bcbb12 commit 61e8de3

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

tests/containers/podman_e2e.pm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ my $version;
2323
sub setup {
2424
my $self = shift;
2525
my @pkgs = qw(aardvark-dns apache2-utils buildah catatonit glibc-devel-static go1.26 gpg2 jq libgpgme-devel
26-
libseccomp-devel make netavark openssl podman podman-remote skopeo socat sudo systemd-container xfsprogs);
27-
push @pkgs, qw(criu libcriu2) unless is_sle;
26+
libseccomp-devel make netavark openssl podman podman-remote runc skopeo socat sudo systemd-container xfsprogs);
27+
push @pkgs, qw(criu crun libcriu2) unless is_sle;
2828
$oci_runtime = get_var("OCI_RUNTIME", "runc");
29-
push @pkgs, $oci_runtime;
3029

3130
$self->setup_pkgs(@pkgs);
3231
select_serial_terminal;
3332

33+
run_command "modprobe null_blk nr_devices=1 || true";
34+
3435
# rootless user needed for these tests
3536
run_command "useradd -m containers";
3637
run_command "usermod --add-subuids 100000-165535 containers";
@@ -47,6 +48,7 @@ sub setup {
4748
$version = "v$version";
4849
record_info("version", $version);
4950
record_info("info", script_output("podman info -f json"));
51+
record_info("OCI features", script_output("$oci_runtime features"));
5052
record_info("OCI runtime", script_output("$oci_runtime --version"));
5153

5254
# Download podman sources

0 commit comments

Comments
 (0)