From edfe2f33359a3c80817e96312c948880ae732cf5 Mon Sep 17 00:00:00 2001
From: Allison Karlitskaya <allison.karlitskaya@redhat.com>
Date: Thu, 8 Feb 2024 08:43:20 +0100
Subject: [PATCH] Revert "build: install wheel from Cockpit git main"

This reverts commit 60d5f71c083be74659c9273aac97e00da2881fa3.

fsinfo is now available in all of our testing images.
---
 Makefile                | 11 +++--------
 test/browser/browser.sh |  3 ---
 test/browser/main.fmf   |  1 -
 test/install-wheel      | 20 --------------------
 4 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 test/install-wheel

diff --git a/Makefile b/Makefile
index ff80c49a4..4d341051f 100644
--- a/Makefile
+++ b/Makefile
@@ -168,12 +168,7 @@ 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
 
@@ -181,13 +176,13 @@ $(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)
diff --git a/test/browser/browser.sh b/test/browser/browser.sh
index c3d17cb35..667c5fc75 100755
--- a/test/browser/browser.sh
+++ b/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
diff --git a/test/browser/main.fmf b/test/browser/main.fmf
index 9d21ccfb4..d7bda1f6c 100644
--- a/test/browser/main.fmf
+++ b/test/browser/main.fmf
@@ -10,6 +10,5 @@ require:
   - make
   - npm
   - python3
-  - python3-pip
 test: ./browser.sh
 duration: 60m
diff --git a/test/install-wheel b/test/install-wheel
deleted file mode 100644
index 46425f7a0..000000000
--- a/test/install-wheel
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -eux
-
-. /usr/lib/os-release
-
-WHEEL='/var/tmp/cockpit-0-py3-none-any.whl'
-
-case "${ID}" in
-    arch)
-        pacman -Sy --noconfirm python-pip
-        pip install --prefix=/usr "${WHEEL}"
-        ;;
-    debian)
-        apt-get update
-        apt-get install -y python3-pip
-        pip install --break-system-packages "${WHEEL}"
-        ;;
-    *)
-        pip install "${WHEEL}"
-        ;;
-esac