test: Prepare VM image without networking

This ensures that we stay independent from any changes that go on in
online repositories, and our mock/pbuilders are sufficiently pre-cached.

Drop the explicit install of `cockpit-ws` -- all our bots images have it
pre-installed.
This commit is contained in:
Martin Pitt 2022-02-22 12:14:07 +01:00 committed by Martin Pitt
parent 052eb5d57a
commit 90ae15d812

View file

@ -118,9 +118,10 @@ rpm: $(TARFILE) $(NODE_CACHE) $(SPEC)
rm -r "`pwd`/output" "`pwd`/build" rm -r "`pwd`/output" "`pwd`/build"
# build a VM with locally built distro pkgs installed # build a VM with locally built distro pkgs installed
# disable networking, VM images have mock/pbuilder with the common build dependencies pre-installed
$(VM_IMAGE): $(TARFILE) $(NODE_CACHE) bots $(VM_IMAGE): $(TARFILE) $(NODE_CACHE) bots
bots/image-customize --verbose --fresh --upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \ bots/image-customize --verbose --no-network --fresh \
--install cockpit-ws \ --upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \
--script $(CURDIR)/test/vm.install $(TEST_OS) --script $(CURDIR)/test/vm.install $(TEST_OS)
# convenience target for the above # convenience target for the above