From 40e9c54cbb9433e3be3dcc2dd7300c6cf806436d Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Tue, 21 May 2019 17:17:15 +0200 Subject: [PATCH] test: Fix vm.install to be idempotent Clean build-results from the VM so that `make vm` can be run without resetting. Also be more verbose to catch rpm errors. --- test/vm.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/vm.install b/test/vm.install index 4f4bacea..c6c01196 100644 --- a/test/vm.install +++ b/test/vm.install @@ -8,10 +8,11 @@ partprobe pvresize /dev/vda2 lvresize fedora/root -l+100%FREE -r +rm -rf build-results su builder -c "/usr/bin/mock --no-clean --resultdir build-results --rebuild $SRPM" packages=$(find build-results -name '*.rpm' -not -name '*.src.rpm') -rpm -e $(basename -a ${packages[@]} | sed 's/-[0-9].*.rpm$//') || true +rpm -e --verbose $(basename -a ${packages[@]} | sed 's/-[0-9].*.rpm$//') || true yum install -y beakerlib $packages systemctl enable lorax-composer.socket