Mesa (main): ci: install gfxinfo-mupuf in the test-vk image

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 8756de2d8071baeba0a2763856eeeff39fd8f0e3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8756de2d8071baeba0a2763856eeeff39fd8f0e3

Author: Andres Gomez <agomez at igalia.com>
Date:   Wed Jun 22 10:17:45 2022 +0300

ci: install gfxinfo-mupuf in the test-vk image

This python module is needed for Valve's tracing jobs.

Signed-off-by: Andres Gomez <agomez at igalia.com>
Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17184>

---

 .gitlab-ci/container/debian/x86_test-vk.sh | 9 +++++++++
 .gitlab-ci/image-tags.yml                  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh
index 2e38953fd0a..f231f463027 100644
--- a/.gitlab-ci/container/debian/x86_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_test-vk.sh
@@ -36,7 +36,11 @@ STABLE_EPHEMERAL=" \
       p7zip \
       patch \
       pkg-config \
+      python3-dev \
       python3-distutils \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
       software-properties-common \
       wget \
       wine64-tools \
@@ -46,6 +50,7 @@ STABLE_EPHEMERAL=" \
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
       libxcb-shm0 \
+      pciutils \
       python3-lxml \
       python3-simplejson \
       xinit \
@@ -60,6 +65,10 @@ apt-key add .gitlab-ci/container/debian/winehq.gpg.key
 apt-add-repository https://dl.winehq.org/wine-builds/debian/
 apt update -qyy
 
+# Needed for Valve's tracing jobs to collect information about the graphics
+# hardware on the test devices.
+pip3 install gfxinfo-mupuf==0.0.9
+
 apt install -y --no-remove --install-recommends winehq-stable
 
 function setup_wine() {
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 9eab20365ec..6252d953e69 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -12,7 +12,7 @@ variables:
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
    DEBIAN_X86_TEST_GL_TAG: "2022-06-20-apitrace-update"
-   DEBIAN_X86_TEST_VK_TAG: "2022-06-18-winehq-stable"
+   DEBIAN_X86_TEST_VK_TAG: "2022-06-19-gfxinfo-mupuf"
 
    FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
    KERNEL_ROOTFS_TAG: "2022-06-20-apitrace-update"