Skip to content

Commit

Permalink
tests/kola: drop podman v3 workaround from kernel-replace test
Browse files Browse the repository at this point in the history
This shouldn't be needed any longer.
  • Loading branch information
dustymabe committed Jan 28, 2025
1 parent 514b998 commit 26e11c3
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions tests/kola/rpm-ostree/kernel-replace
Original file line number Diff line number Diff line change
Expand Up @@ -121,19 +121,7 @@ RUN rpm-ostree override replace \
rpm-ostree cleanup -m && \
ostree container commit
EOF
# Older podman found in RHEL8 blows up without /etc/resolv.conf
# which happens in our qemu path.
touched_resolv_conf=0
if test '!' -f /etc/resolv.conf; then
podmanv=$(podman --version)
case "${podmanv#podman version }" in
3.*) touched_resolv_conf=1; touch /etc/resolv.conf;;
esac
fi
podman build --net=host -t localhost/coreos-derived --squash .
if test "${touched_resolv_conf}" -eq 1; then
rm -vf /etc/resolv.conf
fi
derived=oci:$image_dir:derived
skopeo copy containers-storage:localhost/coreos-derived $derived
rpm-ostree --version
Expand Down

0 comments on commit 26e11c3

Please sign in to comment.