fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 00:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: Update to Debian 13 (trixie)

Browse source 
Switch containers from Debian 12 (bookworm) to Debian 13 (trixie).

Trixie ships LLVM 19 by default, so we no longer need to add LLVM repos
to install llvm-19.

Notably, trixie also uses Python 3.13.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6994
Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35853>
This commit is contained in:
Valentine Burley 2025-05-15 12:21:41 +02:00 • committed by Marge Bot
parent 36ad57c729
commit 8803388d15
30 changed files with 27 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/common/init-stage1.sh
View file

@ -29,7 +29,7 @@ fi
# Set the time so we can validate certificates before we fetch anything;
# however as not all DUTs have network, make this non-fatal.
for _ in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done || true
for _ in 1 2 3; do ntpdig -sS pool.ntp.org && break || sleep 2; done || true
# Create a symlink from /dev/fd to /proc/self/fd if /dev/fd is missing.
if [ ! -e /dev/fd ]; then

2
.gitlab-ci/container/debian/arm64_build.sh
View file

@ -35,7 +35,9 @@ DEPS=(
cmake
curl
"clang-${LLVM_VERSION}"
dpkg-dev
fastboot
file
flatbuffers-compiler
flex
g++

1
.gitlab-ci/container/debian/baremetal_arm_test.sh
View file

@ -17,7 +17,6 @@ DEPS=(
netcat-openbsd
openssh-server
procps
python3-distutils
python3-filelock
python3-fire
python3-minimal

4
.gitlab-ci/container/debian/gitlab-ci.yml
View file

@ -17,7 +17,7 @@
.debian-container-version:
variables:
FDO_DISTRIBUTION_VERSION: bookworm-slim
FDO_DISTRIBUTION_VERSION: trixie-slim
.debian-container:
extends:
@ -103,7 +103,7 @@ debian/ppc64el_build:
- .use-debian/x86_64_build-base
variables:
MESA_IMAGE_TAG: &debian-ppc64el_build ${DEBIAN_BUILD_TAG}
LLVM_VERSION: &debian-ppc64el-llvm 15 # no LLVM packages for PPC
LLVM_VERSION: &debian-ppc64el-llvm 19
.use-debian/ppc64el_build:
tags:

2
.gitlab-ci/container/debian/maybe-add-llvm-repo.sh
View file

@ -3,7 +3,7 @@
# Check to see if we need a separate repo to install LLVM.
case "${FDO_DISTRIBUTION_VERSION%-*},${LLVM_VERSION}" in
bookworm,15)
trixie,19)
NEED_LLVM_REPO="false"
;;
*)

12
.gitlab-ci/container/debian/test-base.sh
View file

@ -15,7 +15,7 @@ uncollapsed_section_start debian_setup "Base Debian system setup"
export DEBIAN_FRONTEND=noninteractive
apt-get install -y curl ca-certificates gnupg2 software-properties-common
apt-get install -y curl ca-certificates gnupg2
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
@ -118,15 +118,16 @@ DEPS=(
"libllvm${LLVM_VERSION}"
liblz4-1
libpixman-1-0
libpng16-16
libpng16-16t64
libproc2-0
libpython3.11
libtirpc3
libpython3.13
libtirpc3t64
libubsan1
libvulkan1
libwayland-client0
libwayland-server0
libxcb-composite0
libxcb-dri2-0
libxcb-ewmh2
libxcb-randr0
libxcb-shm0
@ -137,6 +138,7 @@ DEPS=(
libxkbcommon0
libxrandr2
libxrender1
ntpsec-ntpdig
libxshmfence1
ocl-icd-libopencl1
pciutils
@ -150,7 +152,6 @@ DEPS=(
python3-simplejson
python3-six
python3-yaml
sntp
socat
spirv-tools
sysvinit-core
@ -167,7 +168,6 @@ DEPS=(
HW_DEPS=(
netcat-openbsd
mount
python3-distutils
python3-serial
tzdata
zstd

1
.gitlab-ci/container/debian/test-gl.sh
View file

@ -50,7 +50,6 @@ EPHEMERAL=(
patch
pkgconf
python-is-python3
python3-distutils
xz-utils
)

1
.gitlab-ci/container/debian/test-vk.sh
View file

@ -44,7 +44,6 @@ EPHEMERAL=(
patch
pkgconf
python3-dev
python3-distutils
python3-pip
python3-setuptools
python3-wheel

1
.gitlab-ci/container/strip-rootfs.sh
View file

@ -47,7 +47,6 @@ UNNEEDED_PACKAGES=(
libgl1-mesa-dri mesa-vulkan-drivers mesa-va-drivers mesa-vdpau-drivers i965-va-driver
intel-media-va-driver
gnupg2
software-properties-common
)
# Removing unneeded packages

6
.gitlab-ci/image-tags.yml
View file

@ -19,10 +19,10 @@ include:
- .gitlab-ci/conditional-build-image-tags.yml
variables:
DEBIAN_BUILD_BASE_TAG: "20250818-s3url"
DEBIAN_BUILD_BASE_TAG: "20250901-trixie"
DEBIAN_BUILD_TAG: "20250825-finds3"
DEBIAN_TEST_BASE_TAG: "20250818-s3url"
DEBIAN_TEST_BASE_TAG: "20250901-trixie2"
DEBIAN_TEST_ANDROID_TAG: "20250911-angle"
DEBIAN_TEST_GL_TAG: "20250911-piglit"
DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
@ -36,7 +36,7 @@ variables:
KERNEL_TAG: "v6.16-mesa-9d85"
KERNEL_REPO: "gfx-ci/linux"
PKG_REPO_REV: "95bf62c"
PKG_REPO_REV: "b3d1017b"
FIRMWARE_TAG: "36f9bbfa"
FIRMWARE_REPO: "gfx-ci/firmware"

2
.gitlab-ci/run-pytest.sh
View file

@ -9,7 +9,7 @@
set -eu
PYTHON_BIN="python3.11"
PYTHON_BIN="python3.13"
if [ -z "${SCRIPTS_DIR:-}" ]; then
SCRIPTS_DIR="$(dirname "${0}")"

2
.gitlab-ci/setup-test-env.sh
View file

@ -300,7 +300,7 @@ function find_s3_project_artifact() {
x_off
local artifact_path="$1"
for project in "gallo/mesa" "${S3_PROJECT_PATH}"; do
for project in "Valentine/mesa" "${S3_PROJECT_PATH}"; do
local full_path="${FDO_HTTP_CACHE_URI:-}${S3_BASE_PATH}/${project}/${artifact_path}"
if curl-with-retry -s --head "https://${full_path}" >/dev/null; then
echo "https://${full_path}"

1
src/amd/ci/radeonsi-mendocino-fails.txt
View file

@ -397,7 +397,6 @@ spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,F
spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail
spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output -small -scan 1 50,Fail
spec@arb_texture_multisample@sample-position@4,Fail
spec@arb_viewport_array@display-list,Fail
spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_khr_surfaceless_context@viewport,Fail
spec@egl_mesa_configless_context@basic,Fail

2
src/amd/ci/radeonsi-raven-fails.txt
View file

@ -32,8 +32,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful
spec@!opengl 1.1@line-smooth-stipple,Fail
# since Debian 12 (bookworm) uprev
spec@arb_viewport_array@display-list,Fail
# since transition XORG -> WESTON
glx@glx_arb_sync_control@waitformsc,Fail

2
src/amd/ci/radeonsi-stoney-fails.txt
View file

@ -135,8 +135,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful
spec@!opengl 1.1@line-smooth-stipple,Fail
# since Debian 12 (bookworm)
spec@arb_viewport_array@display-list,Fail
# since transition XORG -> WESTON
glx@glx_arb_sync_control@waitformsc,Fail

1
src/amd/ci/radeonsi-vangogh-fails.txt
View file

@ -9,7 +9,6 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail
spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail
spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail
spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output -small -scan 1 50,Fail
spec@arb_viewport_array@display-list,Fail
spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_khr_surfaceless_context@viewport,Fail
spec@ext_external_objects@vk-image-display,Crash

2
src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
View file

@ -96,8 +96,6 @@ spec@arb_sample_shading@samplemask 8@1.000000 mask_in_one,Fail
spec@arb_sample_shading@samplemask 8@noms mask_in_one,Fail
spec@arb_sample_shading@samplemask 8@sample mask_in_one,Fail
spec@arb_viewport_array@display-list,Fail
spec@arb_shader_image_load_store@early-z,Fail
spec@arb_shader_image_load_store@early-z@occlusion query test/early-z pass,Fail

1
src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
View file

@ -81,7 +81,6 @@ spec@!opengl 1.0@depth-clear-precision-check,Fail
spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail
# Debian bookworm fails
spec@arb_viewport_array@display-list,Fail
spec@intel_shader_atomic_float_minmax@execution@ssbo-atomicmin-float-nan,Fail
spec@intel_shader_atomic_float_minmax@execution@ssbo-atomicmax-float-nan,Fail
spec@intel_shader_atomic_float_minmax@execution@ssbo-atomiccompswap-float,Crash

1
src/gallium/drivers/softpipe/ci/softpipe-fails.txt
View file

@ -1230,7 +1230,6 @@ spec@arb_texture_buffer_object@texture-buffer-size-clamp,Fail
spec@nv_shader_atomic_float@execution@ssbo-atomicexchange-float,Fail
spec@arb_viewport_array@display-list,Fail
spec@arb_texture_buffer_object@texture-buffer-size-clamp@r8ui_texture_buffer_size_via_image,Fail
spec@arb_texture_buffer_object@texture-buffer-size-clamp@r8ui_texture_buffer_size_via_sampler,Fail
spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_size_via_image,Fail

1
src/gallium/drivers/svga/ci/svga-fails.txt
View file

@ -658,7 +658,6 @@ spec@arb_texture_view@rendering-layers-image@layers rendering of image1DArray,Fa
spec@arb_texture_view@rendering-layers-image@layers rendering of image2DArray,Fail
spec@arb_texture_view@rendering-layers-image@layers rendering of imageCubeArray,Fail
spec@arb_uniform_buffer_object@maxblocks,Fail
spec@arb_viewport_array@display-list,Fail
spec@arb_viewport_array@render-depthrange,Fail
spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_ext_device_base@conformance,Fail

3
src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt
View file

@ -489,9 +489,6 @@ spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail
spec@!opengl 1.1@line-smooth-stipple,Fail
# fails since CI uprev to Debian 12
spec@arb_viewport_array@display-list,Fail
spec@arb_gl_spirv@execution@ssbo@unsized-array,Fail
spec@!opengl 1.1@line-flat-clip-color,Fail
spec@glsl-1.40@uniform_buffer@two-stages,Fail

1
src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt
View file

@ -549,7 +549,6 @@ spec@arb_texture_buffer_object@formats (vs- arb)@GL_INTENSITY8,Fail
spec@arb_texture_buffer_object@formats (vs- arb)@GL_INTENSITY8I_EXT,Fail
spec@arb_texture_buffer_object@formats (vs- arb)@GL_INTENSITY8UI_EXT,Fail
spec@arb_viewport_array@display-list,Fail
spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_chromium_sync_control@conformance,Fail
spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail

1
src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
View file

@ -572,7 +572,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail
# since Debian 12 (bookworm) uprev
spec@arb_viewport_array@display-list,Fail
glx@glx-multi-window-single-context,Fail
spec@arb_timer_query@timestamp-get,Fail

2
src/gallium/drivers/zink/ci/zink-lavapipe-fails.txt
View file

@ -120,8 +120,6 @@ spec@ext_transform_feedback@tessellation quads wireframe,Fail
# Debian 12 CI update, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/9072
spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail
spec@arb_viewport_array@display-list,Fail
# uprev Piglit in Mea
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export-tex,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail

1
src/gallium/drivers/zink/ci/zink-nvk-ad106-fails.txt
View file

@ -496,7 +496,6 @@ spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA32UI_EXT,Fail
spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA8I_EXT,Fail
spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA8UI_EXT,Fail
spec@arb_texture_cube_map_array@texsubimage cube_map_array,Fail
spec@arb_viewport_array@display-list,Fail
spec@egl 1.4@egl-ext_egl_image_storage,Fail
spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_chromium_sync_control@conformance,Fail

1
src/gallium/drivers/zink/ci/zink-nvk-ga106-fails.txt
View file

@ -503,7 +503,6 @@ spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA32UI_EXT,Fail
spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA8I_EXT,Fail
spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA8UI_EXT,Fail
spec@arb_texture_cube_map_array@texsubimage cube_map_array,Fail
spec@arb_viewport_array@display-list,Fail
spec@egl 1.4@egl-ext_egl_image_storage,Fail
spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_chromium_sync_control@conformance,Fail

3
src/gallium/drivers/zink/ci/zink-radv-fails.txt
View file

@ -10,9 +10,6 @@ spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_ust_test,Fai
# #6322
spec@arb_framebuffer_object@fbo-blit-scaled-linear,Fail
# Regression noticed in https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/891104
spec@arb_viewport_array@display-list,Fail
spec@!opengl 1.0@gl-1.0-no-op-paths,Fail
spec@!opengl 1.1@line-smooth-stipple,Fail
spec@!opengl 1.1@polygon-mode,Fail

2
src/gallium/drivers/zink/ci/zink-venus-lavapipe-fails.txt
View file

@ -146,5 +146,3 @@ spec@ext_transform_feedback@tessellation quad_strip wireframe,Crash
spec@!opengl 1.0@gl-1.0-dlist-beginend,Crash
spec@arb_clip_control@arb_clip_control-depth-precision,Crash
spec@nv_texture_barrier@blending-in-shader,Crash
spec@arb_viewport_array@display-list,Fail

3
src/intel/ci/iris-kbl-fails.txt
View file

@ -87,9 +87,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful
spec@!opengl 1.1@line-smooth-coverage,Fail
spec@!opengl 1.1@line-smooth-stipple,Fail
# fails after Debian bookworm update
spec@arb_viewport_array@display-list,Fail
# Uprev Piglit in Mesa
spec@arb_framebuffer_object@execution@msaa-alpha-to-coverage_alpha-to-one,Fail
spec@arb_framebuffer_object@execution@msaa-alpha-to-coverage_alpha-to-one_write-z,Fail

10
src/virtio/ci/venus-fails.txt
View file

@ -11,3 +11,13 @@ dEQP-VK.pipeline.fast_linked_library.multisample.sample_rate_a2c.static_a2c,Fail
# From venus-lavapipe-full
dEQP-VK.draw.renderpass.multiple_interpolation.structured.with_sample_decoration.4_samples,Fail
dEQP-VK.memory.mapping.suballocation.sub.4087.offset_129.size_255.subflush_map2,Crash
# New crashes with to Debian 13
dEQP-VK.glsl.builtin.precision_fp16_storage32b.tan.compute.vec3,Crash
dEQP-VK.spirv_assembly.instruction.compute.float16.arithmetic_3.exp2,Crash
dEQP-VK.spirv_assembly.instruction.compute.float_controls2.fp16.input_args.cos_testedWithout_NotNaN_OR_NotInf_arg1_minusInf_arg2_unused_res_nan_deco,Crash
dEQP-VK.spirv_assembly.instruction.graphics.float16.arithmetic_3.acosh_vert,Crash
dEQP-VK.spirv_assembly.instruction.graphics.float16.arithmetic_4.sin_frag,Crash
dEQP-VK.spirv_assembly.instruction.graphics.float_controls2.fp16.input_args.sin_testedWithout_NotNaN_arg1_nan_arg2_one_res_nan_exec_vert,Crash
dEQP-VK.spirv_assembly.instruction.graphics.float_controls2.fp16.input_args.sinh_testedWithout_NotInf_arg1_minusInf_arg2_unused_res_minusInf_deco_frag,Crash