Mesa (main): ci/crosvm: clean crosvm socket

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: ea33e44ce4f95ce45729b75dee34be50df749f09
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea33e44ce4f95ce45729b75dee34be50df749f09

Author: Sergi Blanch Torne <sergi.blanch.torne at collabora.com>
Date:   Fri Jun 10 11:33:48 2022 +0200

ci/crosvm: clean crosvm socket

When the 'vm stop' command fails because the crosvm instance
that would be listening to it is already dead, remove the
socket file to avoid crosvm complaining and refusing to boot

Reviewed-by: Emma Anholt <emma at anholt.net>
Reviewed-by: David Heidelberg <david.heidelberg at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16963>

---

 .gitlab-ci/crosvm-runner.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh
index b735565b790..15e6655e92f 100755
--- a/.gitlab-ci/crosvm-runner.sh
+++ b/.gitlab-ci/crosvm-runner.sh
@@ -54,7 +54,7 @@ VM_SOCKET=crosvm-${THREAD}.sock
 # was terminated due to timeouts.  This "vm stop" may fail if the crosvm died
 # without cleaning itself up.
 if [ -e $VM_SOCKET ]; then
-   crosvm stop $VM_SOCKET || true
+   crosvm stop $VM_SOCKET || rm -rf $VM_SOCKET
    # Wait for socats from that invocation to drain
    sleep 5
 fi