From 357490ba446eb90bdd64729bd78ead08f7f02cfe Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 29 Aug 2018 12:07:30 +0200 Subject: [PATCH] test: Properly clean up test VM on image preparation Remove the entire previous overlay instead of just removing the built package. This ensures that there are no leftovers from previous interactive debugging sessions. This has already shown to lead to confusion in practice in cockpit-podman. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9746a42..b533ef7 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,8 @@ rpm: dist-gzip cockpit-$(PACKAGE_NAME).spec # build a VM with locally built rpm installed $(VM_IMAGE): rpm bots - bots/image-customize -v -r 'rpm -e cockpit-$(PACKAGE_NAME) || true' -i cockpit -i `pwd`/cockpit-$(PACKAGE_NAME)-*.noarch.rpm -s $(CURDIR)/test/vm.install $(TEST_OS) + rm -f $(VM_IMAGE) + bots/image-customize -v -i cockpit -i `pwd`/cockpit-$(PACKAGE_NAME)-*.noarch.rpm -s $(CURDIR)/test/vm.install $(TEST_OS) # convenience target for the above vm: $(VM_IMAGE)