Add libkrun Mac task

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2024-07-16 10:09:01 -04:00
parent dfab16e94e
commit 029a9aa34e
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
2 changed files with 21 additions and 7 deletions

View File

@ -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

View File

@ -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