From a2ccee27f6511f9cb4876fcfb21195e0f67232f6 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Mon, 21 Apr 2025 14:23:06 +0200
Subject: [PATCH] Revert "ci/pytest: make sure tests run on correct branch (MR
 6418)"

The wrong branch was not only used for pytest, but for all CI tests that
used pmbootstrap. I've fixed the bug in pmbootstrap now and added a
generic check to ensure we would catch a similar bug if we had one in
the future.

This reverts commit 7fd9e01f7f6b70c160bc58d7400cbd58f6fdf6ac.

Related: pmaports issue 3674
Related: pmbootstrap MR 2586
Related: ci-common MR 14

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6439
---
 .ci/pytest.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.ci/pytest.sh b/.ci/pytest.sh
index cd5c2c8e1..2baa8ea17 100755
--- a/.ci/pytest.sh
+++ b/.ci/pytest.sh
@@ -10,8 +10,6 @@ if [ "$(id -u)" = 0 ]; then
 	set -x
 	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh pytest
-	# FIXME: workaround for pmb init switching the branch on us...
-	su "${TESTUSER:-pmos}" -c "git -C $CI_PROJECT_DIR checkout $CI_COMMIT_SHA"
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi