From 963726b6bc121c5b639bda7d0aed55df3d4982d2 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Tue, 17 Sep 2024 12:12:06 +0200
Subject: [PATCH] ci: allow Podman and CRI-O side by side

The issue with the conflict got resolved and we can now use both tools
side by side.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 hack/ci/Vagrantfile-debian | 6 +-----
 hack/ci/Vagrantfile-ubuntu | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/hack/ci/Vagrantfile-debian b/hack/ci/Vagrantfile-debian
index 78864e3b6..fc6f4e2a8 100644
--- a/hack/ci/Vagrantfile-debian
+++ b/hack/ci/Vagrantfile-debian
@@ -68,6 +68,7 @@ Vagrant.configure("2") do |config|
       echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://pkgs.k8s.io/addons:/cri-o:/prerelease:/main/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
       apt-get update
       apt-get install -y \
+        cri-o \
         kubelet \
         kubeadm \
         kubectl \
@@ -76,12 +77,7 @@ Vagrant.configure("2") do |config|
       # Load the prebuilt container image
       podman load -i /vagrant/image.tar
 
-      # Remove podman, this package conflicts with CRI-O
-      apt-get remove --purge -y podman
-      apt-get autoremove -y
-
       # Setup CRI-O
-      apt-get install -y cri-o
       systemctl enable --now crio
 
       /vagrant/hack/ci/install-kubernetes.sh
diff --git a/hack/ci/Vagrantfile-ubuntu b/hack/ci/Vagrantfile-ubuntu
index 057644ce2..b29bc31f7 100644
--- a/hack/ci/Vagrantfile-ubuntu
+++ b/hack/ci/Vagrantfile-ubuntu
@@ -43,6 +43,7 @@ Vagrant.configure("2") do |config|
       apt-get update
       apt-get install -y \
         build-essential \
+        cri-o \
         kubelet \
         kubeadm \
         kubectl \
@@ -55,10 +56,6 @@ Vagrant.configure("2") do |config|
       # Load the prebuilt container image
       podman load -i /vagrant/image.tar
 
-      # Remove podman, this package conflicts with CRI-O
-      apt-get remove --purge -y podman
-      apt-get autoremove -y
-
       # Baseprofile recording requires cosign
       COSIGN_VERSION=v2.2.1
       COSIGN_BINARY=/usr/bin/cosign
@@ -66,7 +63,6 @@ Vagrant.configure("2") do |config|
       chmod +x "$COSIGN_BINARY"
 
       # Setup CRI-O
-      apt-get install -y cri-o
       systemctl enable --now crio
 
       # Disable kernel print rate limiting for syslog messaging