From 4149d8d81029763e8d60f916408817ee47b8191c Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Thu, 7 Jan 2021 11:29:01 +0100
Subject: [PATCH] test: Fix vm.install for non-LVM cloud images

Some of our images, like centos-8-stream, are already built from the
official cloud images instead of virt-install with LVM. More images are
going to do that soon [1][2], so fix vm.install to only do the LVM grow
steps if the image actually uses LVM.

Also adjust the comment, as commit 6ddaa5e0dd0b0ce9db fixed this for
RHEL images.

[1] https://github.com/cockpit-project/bots/pull/1518
[2] https://github.com/cockpit-project/bots/pull/1527

(cherry-picked from commit 04ce221a6523cef)
---
 test/vm.install | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/vm.install b/test/vm.install
index cc38769c..6a1f26e8 100755
--- a/test/vm.install
+++ b/test/vm.install
@@ -35,12 +35,15 @@ if ! rpm -q qemu-kvm; then
     yum install -y qemu-kvm
 fi
 
-# Grow root partition to make room for images. This only works on Fedora right now.
-parted --script /dev/vda resizepart 2 100%
-partprobe
-pvs --noheadings -opv_name | xargs pvresize
-rootlv=$(findmnt --noheadings -oSOURCE /)
-lvresize $rootlv -l+100%FREE -r
+# Grow root partition on LVM test images to make room for built images
+PVS=$(pvs --noheadings -opv_name)
+if [ -n "$PVS" ]; then
+    echo ", +" | sfdisk -N 2 -f /dev/vda
+    partprobe
+    echo "$PVS" | xargs pvresize
+    rootlv=$(findmnt --noheadings -oSOURCE /)
+    lvresize $rootlv -l+100%FREE -r
+fi
 
 rm -rf build-results
 su builder -c "/usr/bin/mock --no-clean --resultdir build-results --rebuild $SRPM"