Skip to content

Commit

Permalink
Go back to using Debian testing cockpit-ws package
Browse files Browse the repository at this point in the history
Partially revert commit 2fe12b8. Debian testing now has Cockpit 318,
and our bots image is up to date again.
  • Loading branch information
martinpitt committed Jun 18, 2024
1 parent ec517cc commit df549de
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit df549de

Please sign in to comment.