From 858472aa831f3e11b603cc06e940f19aec61bd55 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Fri, 4 Oct 2024 11:41:49 +0200 Subject: [PATCH 1/2] Bump bundled krunkit to 0.1.3 Bump the bundled krunkit version from 0.1.2 to 0.1.3. Fixes: #23296 Signed-off-by: Sergio Lopez --- contrib/pkginstaller/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pkginstaller/Makefile b/contrib/pkginstaller/Makefile index 6736bd6cd6..cae78846eb 100644 --- a/contrib/pkginstaller/Makefile +++ b/contrib/pkginstaller/Makefile @@ -8,7 +8,7 @@ else endif GVPROXY_VERSION ?= 0.7.5 VFKIT_VERSION ?= 0.5.1 -KRUNKIT_VERSION ?= 0.1.2 +KRUNKIT_VERSION ?= 0.1.3 GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin VFKIT_RELEASE_URL ?= https://github.com/crc-org/vfkit/releases/download/v$(VFKIT_VERSION)/vfkit-unsigned KRUNKIT_RELEASE_URL ?= https://github.com/containers/krunkit/releases/download/v$(KRUNKIT_VERSION)/krunkit-podman-unsigned-$(KRUNKIT_VERSION).tgz From 3cedd0c2b560b19bee12e57dc428a967fce29b2d Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Mon, 7 Oct 2024 19:40:02 +0200 Subject: [PATCH 2/2] CI: remove skips for libkrun Remove the skips introduced to work around #23296 Signed-off-by: Sergio Lopez --- pkg/machine/e2e/basic_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/machine/e2e/basic_test.go b/pkg/machine/e2e/basic_test.go index e0585e2752..c060479cd9 100644 --- a/pkg/machine/e2e/basic_test.go +++ b/pkg/machine/e2e/basic_test.go @@ -60,8 +60,6 @@ var _ = Describe("run basic podman commands", func() { }) It("Volume ops", func() { - skipIfVmtype(define.LibKrun, "FIXME: #23296 - Fails on MacOS when libkrun in use.") - tDir, err := filepath.Abs(GinkgoT().TempDir()) Expect(err).ToNot(HaveOccurred()) roFile := filepath.Join(tDir, "attr-test-file") @@ -219,7 +217,6 @@ var _ = Describe("run basic podman commands", func() { It("podman build contexts", func() { skipIfVmtype(define.HyperVVirt, "FIXME: #23429 - Error running podman build with option --build-context on Hyper-V") skipIfVmtype(define.QemuVirt, "FIXME: #23433 - Additional build contexts should be sent as additional tar files") - skipIfVmtype(define.LibKrun, "FIXME: #23296 - Fails on MacOS when libkrun in use.") name := randomString() i := new(initMachine) session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow()).run()