diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2023-04-16 02:28:57 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-16 17:28:52 +0000 |
| commit | 74525f8576d3c9fb5175f56b6c57f03d566710f9 (patch) | |
| tree | d9abd53c81fb9513fac3a8ac777a14340441ccbf /.gitlab-ci | |
| parent | 74e423591623a1fabe4060f26b7c251e07b371b3 (diff) | |
| download | mesa-74525f8576d3c9fb5175f56b6c57f03d566710f9.tar.gz | |
ci: uninstall libdrm from the GL and VK containers
Occasionally causing troubles on -valve jobs.
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22255>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/debian/x86_test-gl.sh | 5 | ||||
| -rw-r--r-- | .gitlab-ci/container/debian/x86_test-vk.sh | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh index d616c3ec2f1..4094dbab1d6 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # shellcheck disable=SC2086 # we want word splitting set -e @@ -91,3 +91,6 @@ apt-get purge -y \ $STABLE_EPHEMERAL apt-get autoremove -y --purge + +# hack to remove Debian libdrm (until bookworm), deqp sometimes load old libdrm, we could remove here eventually Mesa too; execute on both GL and VK container +dpkg -r --force-depends "libdrm2" "libdrm-radeon1" "libdrm-nouveau2" "libdrm-intel1" "libdrm-amdgpu1" "libdrm-common" # "mesa-vulkan-drivers" "mesa-vdpau-drivers" "mesa-va-drivers" "libgl1-mesa-dri" "libglx-mesa0" "vdpau-driver-all" "va-driver-all" "libglx0" "libgl1" "libvdpau-va-gl1" "libglu1-mesa" "libegl-mesa0" "libgl1-mesa-dri" "libglapi-mesa" "libosmesa6" diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index 42b90a3a911..b700b5cc688 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # The relative paths in this file only become valid at runtime. # shellcheck disable=SC1091 # shellcheck disable=SC2086 # we want word splitting @@ -135,3 +135,6 @@ apt-get purge -y \ $STABLE_EPHEMERAL apt-get autoremove -y --purge + +# hack to remove Debian libdrm (until bookworm), deqp sometimes load old libdrm, we could remove here eventually Mesa too; execute on both GL and VK container +dpkg -r --force-depends "libdrm2" "libdrm-radeon1" "libdrm-nouveau2" "libdrm-intel1" "libdrm-amdgpu1" "libdrm-common" # "mesa-vulkan-drivers" "mesa-vdpau-drivers" "mesa-va-drivers" "libgl1-mesa-dri" "libglx-mesa0" "vdpau-driver-all" "va-driver-all" "libglx0" "libgl1" "libvdpau-va-gl1" "libglu1-mesa" "libegl-mesa0" "libgl1-mesa-dri" "libglapi-mesa" "libosmesa6" |