tim/k3s-ansible
1
0
Fork 1
mirror of https://github.com/techno-tim/k3s-ansible.git synced 2026-08-08 23:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): skip removed stale Molecule state

Browse Source 
- Avoid rereading state files after removing a stale scenario directory.\n- Extend cleanup fixture coverage to multiple stale machine states.
This commit is contained in:
Timothy Stewart
2026-07-31 11:03:44 -05:00
committed by Techno Tim
parent 87ea8160c1
commit bb3843dbb1
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/scripts/cleanup-runner-resources.sh
+4
View File
@@ -156,6 +156,10 @@ virtualbox_root_real="$(resolve_existing_dir "$virtualbox_root" || true)"
declare -a vm_records=() declare -a vm_records=()
for state_file in "${state_files[@]}"; do for state_file in "${state_files[@]}"; do
if [[ ! -f "$state_file" ]]; then
printf 'Skipping Vagrant state removed with its stale scenario directory: %s\n' "$state_file"
continue
fi
state_file_real="$(readlink -f -- "$state_file")" state_file_real="$(readlink -f -- "$state_file")"
state_dir="${state_file_real%/.vagrant/machines/*/virtualbox/id}" state_dir="${state_file_real%/.vagrant/machines/*/virtualbox/id}"
machine_dir="${state_file_real%/virtualbox/id}" machine_dir="${state_file_real%/virtualbox/id}"
.github/scripts/test-cleanup-runner-resources.sh
+3
View File
@@ -12,9 +12,12 @@ molecule_root="$test_root/molecule"
virtualbox_root="$test_root/VirtualBox VMs" virtualbox_root="$test_root/VirtualBox VMs"
fake_bin="$test_root/bin" fake_bin="$test_root/bin"
mkdir -p -- "$molecule_root/k3s-ansible/single_node/.vagrant/machines/control1/virtualbox" \ mkdir -p -- "$molecule_root/k3s-ansible/single_node/.vagrant/machines/control1/virtualbox" \
"$molecule_root/k3s-ansible/single_node/.vagrant/machines/control2/virtualbox" \
"$virtualbox_root/control1" "$virtualbox_root/unmarked" "$fake_bin" "$virtualbox_root/control1" "$virtualbox_root/unmarked" "$fake_bin"
printf '%s\n' '11111111-1111-1111-1111-111111111111' \ printf '%s\n' '11111111-1111-1111-1111-111111111111' \
> "$molecule_root/k3s-ansible/single_node/.vagrant/machines/control1/virtualbox/id" > "$molecule_root/k3s-ansible/single_node/.vagrant/machines/control1/virtualbox/id"
printf '%s\n' '22222222-2222-2222-2222-222222222222' \
> "$molecule_root/k3s-ansible/single_node/.vagrant/machines/control2/virtualbox/id"
touch "$virtualbox_root/control1/control1.vbox" "$virtualbox_root/control1/disk.vdi" \ touch "$virtualbox_root/control1/control1.vbox" "$virtualbox_root/control1/disk.vdi" \
"$virtualbox_root/unmarked/unmarked.vbox" "$virtualbox_root/unmarked/unmarked.vbox"