From ec2325a3db7095390b631d58cb587bf7329813eb Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Tue, 1 Aug 2023 20:21:50 +0200
Subject: [PATCH] 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 03d02f398a4d92926e81ae92c04fa25411243004.

(cherry picked from commit 826c1e29ce650d4eb56f960fb3c3cb03a2e201e4)
---
 Makefile | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 1d3e421..276d14b 100644
--- a/Makefile
+++ b/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 --fresh \
-		$(VM_CUSTOMIZE_FLAGS) \
 		--upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \
 		--upload ./test/files/1.journal:/var/log/journal/1.journal \
 		--upload ./test/files/binary-rec.journal:/var/log/journal/binary-rec.journal \