macos13: add support for image in create-runner.sh (#3)

Author: delan

README.md

@@ -152,7 +152,7 @@ To build the base vm, first build a clean image:
 - Create zvol and libvirt guest with random UUID and MAC address
     - `zfs create -V 90G tank/base/servo-macos13.clean`
     - `virsh define macos13/guest.xml`
-    - `virt-clone --preserve-data --check path_in_use=off -o servo-macos13.init -n servo-macos13.clean --nvram /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.servo-macos13.clean.fd -f /var/lib/libvirt/images/OSX-KVM/OpenCore/OpenCore.qcow2 -f /dev/zvol/tank/base/servo-macos13.clean -f /var/lib/libvirt/images/OSX-KVM/BaseSystem.img`
+    - `virt-clone --preserve-data --check path_in_use=off -o servo-macos13.init -n servo-macos13.clean --nvram /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.servo-macos13.clean.fd --skip-copy sda -f /dev/zvol/tank/base/servo-macos13.clean --skip-copy sdc`
     - `cp /var/lib/libvirt/images/OSX-KVM/{OVMF_VARS-1920x1080.fd,OVMF_VARS.servo-macos13.clean.fd}`
     - `virsh undefine --keep-nvram servo-macos13.init`
         - TODO: improve per-vm nvram management
@@ -199,7 +199,7 @@ To build the base vm, first build a clean image:
 - Take another snapshot: `zfs snapshot tank/base/servo-macos13.clean@automated`
 - Clone the clean zvol/guest to create the base zvol/guest:
     - `zfs clone tank/base/servo-macos13{.clean@automated,}`
-    - `virt-clone --preserve-data --check path_in_use=off -o servo-macos13.clean -n servo-macos13 --nvram /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.servo-macos13.fd -f /var/lib/libvirt/images/OSX-KVM/OpenCore/OpenCore.qcow2 -f /dev/zvol/tank/base/servo-macos13 -f /var/lib/libvirt/images/OSX-KVM/BaseSystem.img`
+    - `virt-clone --preserve-data --check path_in_use=off -o servo-macos13.clean -n servo-macos13 --nvram /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.servo-macos13.fd --skip-copy sda -f /dev/zvol/tank/base/servo-macos13 --skip-copy sdc`
     - `cp /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.servo-macos13{.clean,}.fd`
 
 Baking new images after deployment

create-runner.sh

@@ -9,6 +9,7 @@ configuration_name=$1; shift
 github_runner_label=$1; shift
 configure_runner=$script_dir/$configuration_name/configure-runner.sh
 register_runner=$script_dir/$configuration_name/register-runner.sh
+virt_clone=$script_dir/$configuration_name/virt-clone.sh
 
 vm=$base_vm.$id
 >&2 printf '[*] Creating runner: %s\n' $vm
@@ -39,5 +40,5 @@ fi
 "$script_dir/mount-runner.sh" $vm $configure_runner "$runner_jitconfig"
 
 libvirt_vm=$SERVO_CI_LIBVIRT_PREFIX-$vm
-virt-clone --preserve-data --check path_in_use=off -o $base_vm -n $libvirt_vm -f /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm
+$virt_clone $base_vm $vm
 virsh start $libvirt_vm

macos13/configure-runner.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+# usage: configure-runner.sh <runner_jitconfig> <vm>
+script_dir=${0:a:h}/..
+. "$script_dir/common.sh"
+cache_dir=$script_dir/cache
+runner_jitconfig=$1; shift
+vm=$1; shift
+
+>&2 echo '[*] Unpacking GitHub Actions runner'
+mount_dir=$(pwd)
+mkdir -p ~/actions-runner
+cd ~/actions-runner
+tar xf "$mount_dir/init/actions-runner-osx-x64.tar.gz"
+
+>&2 echo '[*] Injecting GitHub Actions config'
+# Register the runner as both ephemeral (one job only) and just-in-time (no token required)
+# See also: <https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-just-in-time-runners>
+> "$mount_dir/init/runner.sh" echo '~/actions-runner/run.sh --jitconfig '"$runner_jitconfig"

macos13/register-runner.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env zsh
+# usage: register-runner.sh <github_runner_label> <vm>
+script_dir=${0:a:h}/..
+. "$script_dir/common.sh"
+github_runner_label=$1; shift
+vm=$1; shift
+$script_dir/register-runner.sh /Volumes/a/a "$github_runner_label" $vm

macos13/virt-clone.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env zsh
+# usage: virt-clone.sh <base_vm> <vm>
+script_dir=${0:a:h}/..
+. "$script_dir/common.sh"
+base_vm=$1; shift
+vm=$1; shift
+
+libvirt_vm=$SERVO_CI_LIBVIRT_PREFIX-$vm
+virt-clone --preserve-data --check path_in_use=off -o $base_vm -n $libvirt_vm --nvram /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.$vm.fd --skip-copy sda -f /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm --skip-copy sdc
+cp /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.$base_vm.fd /var/lib/libvirt/images/OSX-KVM/OVMF_VARS.$vm.fd

ubuntu2204/virt-clone.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env zsh
+# usage: virt-clone.sh <base_vm> <vm>
+script_dir=${0:a:h}/..
+. "$script_dir/common.sh"
+base_vm=$1; shift
+vm=$1; shift
+
+libvirt_vm=$SERVO_CI_LIBVIRT_PREFIX-$vm
+virt-clone --preserve-data --check path_in_use=off -o $base_vm -n $libvirt_vm -f /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm

windows10/virt-clone.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env zsh
+# usage: virt-clone.sh <base_vm> <vm>
+script_dir=${0:a:h}/..
+. "$script_dir/common.sh"
+base_vm=$1; shift
+vm=$1; shift
+
+libvirt_vm=$SERVO_CI_LIBVIRT_PREFIX-$vm
+virt-clone --preserve-data --check path_in_use=off -o $base_vm -n $libvirt_vm -f /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm