ci/lava: Move LAVA dependencies to pip

Use requirements.txt and requirements-test.txt to organize better Python
dependencies related to LAVA.

Now LAVA tooling can use recent and fixed library versions.
And test-related libs will not trigger container rebuilding anymore.

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21325>

.gitlab-ci/container/debian/x86_build.sh

@@ -14,7 +14,6 @@ STABLE_EPHEMERAL=" \
       bzip2 \
       libtool \
       libssl-dev \
-      python3-pip \
       "
 
 apt-get update
@@ -43,8 +42,8 @@ apt-get install -y --no-remove \
       llvm-13-dev \
       llvm-11-dev \
       ocl-icd-opencl-dev \
-      python3-freezegun \
-      python3-pytest \
+      python3-pip \
+      python3-venv \
       procps \
       spirv-tools \
       shellcheck \
@@ -93,7 +92,7 @@ ninja install
 popd
 rm -rf DirectX-Headers
 
-pip3 install lavacli==1.5.2
+python3 -m pip install -r ${CI_PROJECT_DIR}/.gitlab-ci/lava/requirements.txt
 
 # install bindgen
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \

.gitlab-ci/image-tags.yml

@@ -3,7 +3,7 @@ variables:
    DEBIAN_BASE_TAG: "2023-01-28-rust-valgrind"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2023-01-24-android"
+   DEBIAN_BUILD_TAG: "2023-02-14-pip"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2023-01-03-ci-libva-2.17"
@@ -21,7 +21,7 @@ variables:
 
    ALPINE_X86_BUILD_TAG: "2023-01-20-all-in-1"
    FEDORA_X86_BUILD_TAG: "2023-02-09-f36"
-   KERNEL_ROOTFS_TAG: "2023-02-03-uprev-piglit"
+   KERNEL_ROOTFS_TAG: "2023-02-14-pip"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"

.gitlab-ci/lava/lava-pytest.sh

@@ -26,6 +26,11 @@
 
 set -ex
 
+# Use this script in a python virtualenv for isolation
+python3 -m venv .venv
+. .venv/bin/activate
+python3 -m pip install -r ${CI_PROJECT_DIR}/.gitlab-ci/lava/requirements-test.txt
+
 TEST_DIR=${CI_PROJECT_DIR}/.gitlab-ci/tests
 
 PYTHONPATH="${TEST_DIR}:${PYTHONPATH}" python3 -m \

.gitlab-ci/lava/requirements-test.txt

@@ -0,0 +1,5 @@
+-r requirements.txt
+freezegun==1.1.0
+pytest==7.2.1
+pytest-cov==3.0.0
+PyYAML==5.3.1

.gitlab-ci/lava/requirements.txt

@@ -0,0 +1 @@
+lavacli==1.5.2