Revert "build: install wheel from Cockpit git main"

This reverts commit 60d5f71.

fsinfo is now available in all of our testing images.

Makefile

@@ -168,26 +168,21 @@ rpm: $(TARFILE) $(NODE_CACHE) $(SPEC)
 	rm -r "`pwd`/rpmbuild"
 	rm -r "`pwd`/output" "`pwd`/build"
 
-# HACK: we need the 'fsinfo' channel supported only in the Python bridge, and
-# only on the `main` branch of Cockpit (and not in any released version yet).
-# We can re-engage our 'pybridge' scenario logic, which creates and installs a
-# wheel from upstream cockpit git. We should remove this once we get all of our
-# images with the updated version of the bridge.
-ifeq ("pybridge","pybridge")
+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 = --upload $(COCKPIT_WHEEL):/var/tmp --script test/install-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) 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)

test/browser/browser.sh

@@ -21,9 +21,6 @@ if grep -q platform:el8 /etc/os-release; then
     dnf module switch-to -y nodejs:16
 fi
 
-# Install cockpit from git main (for fsinfo)
-TMPDIR=/var/tmp pip install git+https://github.com/cockpit-project/cockpit.git@main
-
 # create user account for logging in
 if ! id admin 2>/dev/null; then
     useradd -c Administrator -G wheel admin

test/browser/main.fmf

@@ -10,6 +10,5 @@ require:
   - make
   - npm
   - python3
-  - python3-pip
 test: ./browser.sh
 duration: 60m