From df549deda0afc05674e33b1d22e641a2ec56ce66 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 18 Jun 2024 17:03:40 +0200 Subject: [PATCH] Go back to using Debian testing cockpit-ws package Partially revert commit 2fe12b8f. Debian testing now has Cockpit 318, and our bots image is up to date again. --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7d4de481..5d7721ee 100644 --- a/Makefile +++ b/Makefile @@ -180,18 +180,11 @@ VM_DEPENDS = $(COCKPIT_WHEEL) VM_CUSTOMIZE_FLAGS = --install $(COCKPIT_WHEEL) endif -# HACK: temporary bump Cockpit on Debian-testing to get > 316 -ifeq ("$(TEST_OS)","debian-testing") -VM_CUSTOMIZE_FLAGS = --run-command "apt update && apt-get install -y -t unstable cockpit" -else -VM_CUSTOMIZE_FLAGS = --no-network -endif - # 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): export XZ_OPT=-0 $(VM_IMAGE): $(TARFILE) $(NODE_CACHE) packaging/arch/PKGBUILD bots test/vm.install $(VM_DEPENDS) - bots/image-customize --fresh \ + bots/image-customize --no-network --fresh \ $(VM_CUSTOMIZE_FLAGS) \ --upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \ --script $(CURDIR)/test/vm.install $(TEST_OS)