Merge pull request #23290 from cevich/add_libkrun_task

Add libkrun Mac task

.cirrus.yml

@@ -790,15 +790,15 @@ podman_machine_mac_task:
     persistent_worker: *mac_pw
     env:
         <<: *mac_env
-        # Consumed by podman-machine ginkgo tests
-        CONTAINERS_MACHINE_PROVIDER: "applehv"
-        # TODO: Should not require a special image, for now it does.
-        # Simply remove the line below when a mac image is GA.
-        # MACHINE_IMAGE: "https://fedorapeople.org/groups/podman/testing/applehv/arm64/fedora-coreos-38.20230925.dev.0-applehv.aarch64.raw.gz"
-        # Values necessary to populate std_name_fmt alias
-        TEST_FLAVOR: "machine-mac"
         DISTRO_NV: "darwin"
         PRIV_NAME: "rootless"  # intended use-case
+    matrix:
+        - env:
+            # See contrib/cirrus/mac_runner.sh
+            TEST_FLAVOR: "machine-applehv"
+        - env:
+            # See contrib/cirrus/mac_runner.sh
+            TEST_FLAVOR: "machine-libkrun"
     clone_script:  # artifacts from osx_alt_build_task
         - mkdir -p $CIRRUS_WORKING_DIR
         - cd $CIRRUS_WORKING_DIR

contrib/cirrus/mac_runner.sh

@@ -29,4 +29,18 @@ function logformatter() {
     "${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/logformatter" "$(output_name)"
 }
 
+# Defined by .cirrus.yml
+# shellcheck disable=SC2154
+case "$TEST_FLAVOR" in
+    machine-applehv)
+        export CONTAINERS_MACHINE_PROVIDER="applehv"
+        ;;
+    machine-libkrun)
+        export CONTAINERS_MACHINE_PROVIDER="libkrun"
+        ;;
+    *)
+        echo "Unknown/unsupported \$TEST_FLAVOR value '$TEST_FLAVOR'."
+        exit 1
+esac
+
 make localmachine 2>&1 | logformatter

pkg/machine/e2e/basic_test.go

@@ -61,6 +61,7 @@ var _ = Describe("run basic podman commands", func() {
 
 	It("Volume ops", func() {
 		skipIfVmtype(define.HyperVVirt, "FIXME: #21036 - Hyper-V podman run -v fails due to path translation issues")
+		skipIfVmtype(define.LibKrun, "FIXME: #23296 - Fails on MacOS when libkrun in use.")
 
 		tDir, err := filepath.Abs(GinkgoT().TempDir())
 		Expect(err).ToNot(HaveOccurred())