From 0a2606cf84b88cc50d2ea951326b24958a0aecc1 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Mon, 2 Sep 2024 11:58:49 +0100
Subject: [PATCH] ci/lava: Don't dump venv into .venv

We could have a lot of venvs around. Pick a slightly more isolated one
for LAVA's pytest.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30978>
---
 .gitlab-ci/lava/lava-pytest.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/lava/lava-pytest.sh b/.gitlab-ci/lava/lava-pytest.sh
index 40125bad2f6..fbc6fbae832 100755
--- a/.gitlab-ci/lava/lava-pytest.sh
+++ b/.gitlab-ci/lava/lava-pytest.sh
@@ -12,9 +12,13 @@ if [ -z "${CI_PROJECT_DIR:-}" ]; then
     CI_PROJECT_DIR="$(dirname "${0}")/../../"
 fi
 
+if [ -z "${LAVA_PYTEST_VENV:-}" ]; then
+    LAVA_PYTEST_VENV="${CI_PROJECT_DIR}/.gitlab-ci/lava/.venv-pytest"
+fi
+
 # Use this script in a python virtualenv for isolation
-python3 -m venv .venv
-. .venv/bin/activate
+python3 -m venv "${LAVA_PYTEST_VENV}"
+. "${LAVA_PYTEST_VENV}"/bin/activate
 python3 -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/.gitlab-ci/lava/requirements-test.txt"
 
 TEST_DIR=${CI_PROJECT_DIR}/.gitlab-ci/tests