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.
This commit is contained in:
Martin Pitt 2018-08-29 12:07:30 +02:00
parent 21e504403b
commit 357490ba44

View file

@ -118,7 +118,8 @@ rpm: dist-gzip cockpit-$(PACKAGE_NAME).spec
# build a VM with locally built rpm installed # build a VM with locally built rpm installed
$(VM_IMAGE): rpm bots $(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 # convenience target for the above
vm: $(VM_IMAGE) vm: $(VM_IMAGE)