From b639a44899cb1b4fc98c975fb2906ee3e512efa9 Mon Sep 17 00:00:00 2001
From: Jakub Rusz <jrusz@redhat.com>
Date: Tue, 22 Mar 2022 14:52:06 +0100
Subject: [PATCH] tests/ostree-simplified-installer: destroy VM when
 installation is stuck

This test get stuck randomly on centos-stream-8 and is making the CI
unreliable. Adding hard wait limit and destroying the VM afterwards
helps the test get unstuck and continue as expected. See
https://github.com/osbuild/osbuild-composer/issues/2413 for details.
---
 test/cases/ostree-simplified-installer.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index 601c5a527..043eca4c2 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -495,9 +495,15 @@ sudo virt-install --name="${IMAGE_KEY}-http"\
                   --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
                   --nographics \
                   --noautoconsole \
-                  --wait=-1 \
+                  --wait=15 \
                   --noreboot
 
+# Installation can get stuck, destroying VM helps
+# See https://github.com/osbuild/osbuild-composer/issues/2413
+if [[ $(sudo virsh domstate "${IMAGE_KEY}-http") == "running" ]]; then
+    sudo virsh destroy "${IMAGE_KEY}-http"
+fi
+
 # Start VM.
 greenprint "💻 Start HTTP BOOT VM"
 sudo virsh start "${IMAGE_KEY}-http"
@@ -621,9 +627,15 @@ sudo virt-install  --name="${IMAGE_KEY}-fdosshkey"\
                    --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
                    --nographics \
                    --noautoconsole \
-                   --wait=-1 \
+                   --wait=15 \
                    --noreboot
 
+# Installation can get stuck, destroying VM helps
+# See https://github.com/osbuild/osbuild-composer/issues/2413
+if [[ $(sudo virsh domstate "${IMAGE_KEY}-fdosshkey") == "running" ]]; then
+    sudo virsh destroy "${IMAGE_KEY}-fdosshkey"
+fi
+
 # Start VM.
 greenprint "💻 Start UEFI VM"
 sudo virsh start "${IMAGE_KEY}-fdosshkey"