From 1cb670a3c18420d1c34cd3da64a7bc94c3108d74 Mon Sep 17 00:00:00 2001 From: Dante Catalfamo <43040593+dantecatalfamo@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:30:58 -0400 Subject: [PATCH] Tools: Choose Enrollment VM base image using environment variable (#18070) Good for running out older versions of macOS during an semi-automated test --- tools/mdm/apple/macos-vm-auto-enroll/README.md | 1 + .../mdm/apple/macos-vm-auto-enroll/macos-vm-auto-enroll.sh | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/mdm/apple/macos-vm-auto-enroll/README.md b/tools/mdm/apple/macos-vm-auto-enroll/README.md index 7f50931750..3045544f71 100644 --- a/tools/mdm/apple/macos-vm-auto-enroll/README.md +++ b/tools/mdm/apple/macos-vm-auto-enroll/README.md @@ -9,6 +9,7 @@ The script takes no arguments, but can be configured through three environment v - `FLEET_ENROLL_SECRET` (required) The fleet enrollment secret - `FLEET_URL` (required) The fleet base url - `MACOS_ENROLLMENT_VM_NAME` (optional) The name of the VM. If nothing is specified, the default name is `enrollment-test`. +- `MACOS_ENROLLMENT_VM_IMAGE` (optional) The image to use for the VM. If nothing is specified, the default image is `ghcr.io/cirruslabs/macos-sonoma-base:latest` The entire process from the generation of the `pkg` file to the installation is automated. The only part that requires user intervention is installing the MDM profile. diff --git a/tools/mdm/apple/macos-vm-auto-enroll/macos-vm-auto-enroll.sh b/tools/mdm/apple/macos-vm-auto-enroll/macos-vm-auto-enroll.sh index 32b469dd04..2d15275e75 100755 --- a/tools/mdm/apple/macos-vm-auto-enroll/macos-vm-auto-enroll.sh +++ b/tools/mdm/apple/macos-vm-auto-enroll/macos-vm-auto-enroll.sh @@ -6,9 +6,13 @@ set -m # Fleet enroll secret placed in $FLEET_ENROLL_SECRET # Fleet URL placed in $FLEET_URL # Optional VM name in $MACOS_ENROLLMENT_VM_NAME +# Optional VM image in $MACOS_ENROLLMENT_VM_IMAGE +# For others see https://tart.run/quick-start/ +# - ghcr.io/cirruslabs/macos-ventura-base:latest +# - ghcr.io/cirruslabs/macos-monterey-base:latest vm_name="${MACOS_ENROLLMENT_VM_NAME:-enrollment-test}" -image_name="ghcr.io/cirruslabs/macos-sonoma-base:latest" +image_name="${MACOS_ENROLLMENT_VM_IMAGE:-ghcr.io/cirruslabs/macos-sonoma-base:latest}" alias ssh_cmd="sshpass -p admin ssh -o \"StrictHostKeyChecking no\" admin@\$(tart ip $vm_name)" alias ssh_interactive_cmd="sshpass -p admin ssh -o \"StrictHostKeyChecking no\" -t admin@\$(tart ip $vm_name)"