Techognito/starter-kit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "build: add support for /pybridge scenario"

Browse source 
We don't need this any more, the pybridge landed in all planned
distributions.

Do keep the more explicit and correct handling of `$TEST_BROWSER` in
test/run, though.

This reverts commit 03d02f398a.

(cherry picked from commit 826c1e29ce)
This commit is contained in:
Martin Pitt 2023-08-01 20:21:50 +02:00 • committed by Justin Stephenson
parent 27ec379aad
commit ec2325a3db
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -153,22 +153,10 @@ rpm: $(TARFILE) $(NODE_CACHE) $(SPEC)
rm -r "`pwd`/rpmbuild" rm -r "`pwd`/rpmbuild"
rm -r "`pwd`/output" "`pwd`/build" rm -r "`pwd`/output" "`pwd`/build"
ifeq ("$(TEST_SCENARIO)","pybridge")
COCKPIT_PYBRIDGE_REF = main
COCKPIT_WHEEL = cockpit-0-py3-none-any.whl
$(COCKPIT_WHEEL):
pip wheel git+https://github.com/cockpit-project/cockpit.git@${COCKPIT_PYBRIDGE_REF}
VM_DEPENDS = $(COCKPIT_WHEEL)
VM_CUSTOMIZE_FLAGS = --install $(COCKPIT_WHEEL)
endif
# 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 # disable networking, VM images have mock/pbuilder with the common build dependencies pre-installed
$(VM_IMAGE): $(TARFILE) $(NODE_CACHE) bots test/vm.install $(VM_DEPENDS) $(VM_IMAGE): $(TARFILE) $(NODE_CACHE) bots test/vm.install
bots/image-customize --fresh \ bots/image-customize --fresh \
$(VM_CUSTOMIZE_FLAGS) \
--upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \ --upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \
--upload ./test/files/1.journal:/var/log/journal/1.journal \ --upload ./test/files/1.journal:/var/log/journal/1.journal \
--upload ./test/files/binary-rec.journal:/var/log/journal/binary-rec.journal \ --upload ./test/files/binary-rec.journal:/var/log/journal/binary-rec.journal \