ci: Update to Debian 13 (trixie)
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:
committed by
Marge Bot
parent
36ad57c729
commit
8803388d15
@@ -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
|
||||
|
||||
@@ -35,7 +35,9 @@ DEPS=(
|
||||
cmake
|
||||
curl
|
||||
"clang-${LLVM_VERSION}"
|
||||
dpkg-dev
|
||||
fastboot
|
||||
file
|
||||
flatbuffers-compiler
|
||||
flex
|
||||
g++
|
||||
|
||||
@@ -17,7 +17,6 @@ DEPS=(
|
||||
netcat-openbsd
|
||||
openssh-server
|
||||
procps
|
||||
python3-distutils
|
||||
python3-filelock
|
||||
python3-fire
|
||||
python3-minimal
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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"
|
||||
;;
|
||||
*)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -50,7 +50,6 @@ EPHEMERAL=(
|
||||
patch
|
||||
pkgconf
|
||||
python-is-python3
|
||||
python3-distutils
|
||||
xz-utils
|
||||
)
|
||||
|
||||
|
||||
@@ -44,7 +44,6 @@ EPHEMERAL=(
|
||||
patch
|
||||
pkgconf
|
||||
python3-dev
|
||||
python3-distutils
|
||||
python3-pip
|
||||
python3-setuptools
|
||||
python3-wheel
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
set -eu
|
||||
|
||||
PYTHON_BIN="python3.11"
|
||||
PYTHON_BIN="python3.13"
|
||||
|
||||
if [ -z "${SCRIPTS_DIR:-}" ]; then
|
||||
SCRIPTS_DIR="$(dirname "${0}")"
|
||||
|
||||
@@ -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}"
|
||||
|
||||
Reference in New Issue
Block a user