Skip to content

Commit

Permalink
Merge pull request os-autoinst#19211 from ricardobranco777/skopeo_hotfix
Browse files Browse the repository at this point in the history
containers: Limit skopeo tests
  • Loading branch information
grisu48 authored Apr 30, 2024
2 parents 64296be + 1b9a7ca commit 61855c6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/main_containers.pm
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ sub load_host_tests_docker {
loadtest 'containers/buildx';
loadtest 'containers/rootless_docker';
}
loadtest('containers/skopeo', run_args => $run_args, name => $run_args->{runtime} . "_skopeo");
loadtest('containers/skopeo', run_args => $run_args, name => $run_args->{runtime} . "_skopeo") unless (is_sle('<15'));
load_volume_tests($run_args);
load_compose_tests($run_args);
loadtest('containers/seccomp', run_args => $run_args, name => $run_args->{runtime} . "_seccomp") unless is_sle('<15');
Expand Down Expand Up @@ -292,7 +292,7 @@ sub load_container_tests {
}

if (get_var('PODMAN_BATS_SKIP')) {
loadtest 'containers/skopeo_integration' if (is_tumbleweed || is_microos || is_sle('>=15-SP4') || is_sle_micro('5.5'));
loadtest 'containers/skopeo_integration' if (is_x86_64 && (is_tumbleweed || is_microos || is_sle('>=15-SP4') || is_sle_micro('5.5')));
loadtest 'containers/podman_integration';
return;
}
Expand Down

0 comments on commit 61855c6

Please sign in to comment.