From 26e11c33602d801b536680de4b2770435a443e7b Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Tue, 28 Jan 2025 11:21:44 -0500
Subject: [PATCH] tests/kola: drop podman v3 workaround from kernel-replace
 test

This shouldn't be needed any longer.
---
 tests/kola/rpm-ostree/kernel-replace | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/kola/rpm-ostree/kernel-replace b/tests/kola/rpm-ostree/kernel-replace
index 2f484ca7a0..a1170b1a2c 100755
--- a/tests/kola/rpm-ostree/kernel-replace
+++ b/tests/kola/rpm-ostree/kernel-replace
@@ -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