Revert "build: add support for /pybridge scenario"
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.
This commit is contained in:
parent
bd2ac26df6
commit
826c1e29ce
1 changed files with 1 additions and 13 deletions
14
Makefile
14
Makefile
|
|
@ -153,22 +153,10 @@ rpm: $(TARFILE) $(NODE_CACHE) $(SPEC)
|
|||
rm -r "`pwd`/rpmbuild"
|
||||
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
|
||||
# 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 --no-network --fresh \
|
||||
$(VM_CUSTOMIZE_FLAGS) \
|
||||
--upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \
|
||||
--script $(CURDIR)/test/vm.install $(TEST_OS)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue