From 995782d09cf63704cffc289d04c112215e618b69 Mon Sep 17 00:00:00 2001
From: Deborah Brouwer <deborah.brouwer@collabora.com>
Date: Wed, 11 Dec 2024 14:33:44 -0800
Subject: [PATCH] ci: stop using a venv for run-pytest.sh

Since run-pytest.sh uses the debian/x86_64_pyutils container, it's not
necessary to add an additional layer of isolation by creating a virtual
environment for run-pytest.sh.

So stop creating a venv when run-pytest is run in a container, but keep
the option of using a venv to run-pytest.sh locally.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32602>
---
 .gitlab-ci/run-pytest.sh      | 20 +++++++++-----------
 .gitlab-ci/test/gitlab-ci.yml |  2 --
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci/run-pytest.sh b/.gitlab-ci/run-pytest.sh
index 91898ef948b..aaef5ddd7e8 100755
--- a/.gitlab-ci/run-pytest.sh
+++ b/.gitlab-ci/run-pytest.sh
@@ -19,8 +19,6 @@ fi
 
 source "${SCRIPTS_DIR}/setup-test-env.sh"
 
-section_start pytest_setup "Setting up pytest environment"
-
 if [ -z "${CI_PROJECT_DIR:-}" ]; then
     CI_PROJECT_DIR="$(dirname "${0}")/../"
 fi
@@ -30,21 +28,21 @@ if [ -z "${CI_JOB_TIMEOUT:-}" ]; then
     export CI_JOB_TIMEOUT=3600
 fi
 
-if [ -z "${MESA_PYTEST_VENV:-}" ]; then
+# If running outside of the debian/x86_64_pyutils container,
+# run in a virtual environment for isolation
+# e.g. USE_VENV=true ./.gitlab-ci/run-pytest.sh
+if [ "${USE_VENV:-}" == true ]; then
+    echo "Setting up virtual environment for local testing."
     MESA_PYTEST_VENV="${CI_PROJECT_DIR}/.venv-pytest"
+    python3 -m venv "${MESA_PYTEST_VENV}"
+    source "${MESA_PYTEST_VENV}"/bin/activate
+    python3 -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/test/requirements.txt"
 fi
 
-# Use this script in a python virtualenv for isolation
-python3 -m venv "${MESA_PYTEST_VENV}"
-. "${MESA_PYTEST_VENV}"/bin/activate
-
-python3 -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/requirements.txt"
-python3 -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/test/requirements.txt"
-
 LIB_TEST_DIR=${CI_PROJECT_DIR}/.gitlab-ci/tests
 SCRIPT_TEST_DIR=${CI_PROJECT_DIR}/bin/ci
 
-uncollapsed_section_switch pytest "Running pytest"
+uncollapsed_section_start pytest "Running pytest"
 
 PYTHONPATH="${LIB_TEST_DIR}:${SCRIPT_TEST_DIR}:${PYTHONPATH:-}" python3 -m \
     pytest "${LIB_TEST_DIR}" "${SCRIPT_TEST_DIR}" \
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 5385dc735d2..fa68730ac04 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -59,9 +59,7 @@ yaml-toml-shell-py-test:
     - section_start shellcheck "shellcheck"
     - .gitlab-ci/run-shellcheck.sh
     - section_end shellcheck
-    - uncollapsed_section_switch pytest "pytest"
     - .gitlab-ci/run-pytest.sh
-    - section_end
   rules:
     - !reference [.disable-farm-mr-rules, rules]
     - !reference [.never-post-merge-rules, rules]