From 90ae15d81248ea7f92818e8054bab8b288572b80 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 22 Feb 2022 12:14:07 +0100 Subject: [PATCH] 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. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7096d67..68e84c1 100644 --- a/Makefile +++ b/Makefile @@ -118,9 +118,10 @@ rpm: $(TARFILE) $(NODE_CACHE) $(SPEC) rm -r "`pwd`/output" "`pwd`/build" # 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 - bots/image-customize --verbose --fresh --upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \ - --install cockpit-ws \ + bots/image-customize --verbose --no-network --fresh \ + --upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \ --script $(CURDIR)/test/vm.install $(TEST_OS) # convenience target for the above