diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2023-07-09 11:27:06 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-07-09 11:33:50 -0400 |
| commit | 766e8628d6d4a205310e36f5f0f9be14f9fdb8cc (patch) | |
| tree | d69c09be86773768cd45e5d15eb2bf03b7ffd47a | |
| parent | 0030d504fd93e322d6402a2e68615f48793e4847 (diff) | |
| download | xfstests-bld-766e8628d6d4a205310e36f5f0f9be14f9fdb8cc.tar.gz | |
test-appliance: run gce-shutdown out of kvm-xfstests.boot
Previously kvm-xfstests.boot would delete the gce-finalize-wait and
then allow the gce-finalize script to trigger gce-shutdown. However,
with Debian Bookwork, somehow gce-shutdown would not complete before
the VM would shut itself down. It's not entirely clear why that's the
case, but it's much simpler to just run gce-shutdown directly out of
kvm-xfstests.boot, so the kvm-xfstests.service systemd unit won't
complete until after the gce-shutdown has completed, and has started
the instance self-delete (which is asynchronous), so it will take a
few seconds to complete.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rwxr-xr-x | test-appliance/files/root/kvm-xfstests.boot | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test-appliance/files/root/kvm-xfstests.boot b/test-appliance/files/root/kvm-xfstests.boot index c806f14c..aa27cf9b 100755 --- a/test-appliance/files/root/kvm-xfstests.boot +++ b/test-appliance/files/root/kvm-xfstests.boot @@ -164,6 +164,7 @@ then /root/runblktests.sh --run-once >> /results/runtests.log 2>&1 /usr/local/lib/gce-logger tests complete + script -c "/bin/bash -vx /usr/local/sbin/gce-shutdown" /dev/console /bin/rm -f /run/gce-finalize-wait else /root/runblktests.sh |