commit e829f3a7babe1a5d008f0ec3e20a4cf813568ee1
parent 326110ddbd205956a777f8ea3885811f8abe3157
Author: Julien Cristau <jcristau@mozilla.com>
Date: Wed, 26 Nov 2025 07:16:52 +0000
Bug 2002016 - add debian13-based docker images. r=taskgraph-reviewers,ahal
Update the clang version, and the path to the archive keyring for buster.
Differential Revision: https://phabricator.services.mozilla.com/D273866
Diffstat:
5 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/taskcluster/config.yml b/taskcluster/config.yml
@@ -113,11 +113,9 @@ treeherder:
'BMcss': 'Beetmover checksums for source'
'Deb8': 'Packages for Debian 8'
'Deb8-32': 'Packages for Debian 8 32-bits'
- 'Deb9': 'Packages for Debian 9'
- 'Deb10': 'Packages for Debian 10'
'Deb10a64': 'AArch64 packages for Debian 10'
- 'Deb11': 'Packages for Debian 11'
'Deb12': 'Packages for Debian 12'
+ 'Deb13': 'Packages for Debian 13'
'Ub18': 'Packages for Ubuntu 18.04'
'Ub20': 'Packages for Ubuntu 20.04'
'Ub22': 'Packages for Ubuntu 22.04'
diff --git a/taskcluster/docker/debian-repackage/Dockerfile b/taskcluster/docker/debian-repackage/Dockerfile
@@ -31,7 +31,7 @@ RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAG
--arch=amd64 \
--variant=buildd \
--include=debhelper,binutils-multiarch,binutils-aarch64-linux-gnu \
- --keyring=/usr/share/keyrings/debian-archive-buster-stable.gpg \
+ --keyring=/usr/share/keyrings/debian-archive-$(if test -f /usr/share/keyrings/debian-archive-buster-stable.gpg; then echo buster-stable.gpg; else echo removed-keys.gpg; fi) \
--verbose \
buster \
/srv/buster-amd64 \
diff --git a/taskcluster/docker/toolchain-build/Dockerfile b/taskcluster/docker/toolchain-build/Dockerfile
@@ -11,6 +11,8 @@ ARG DOCKER_IMAGE_PACKAGES
ARG TASKCLUSTER_ROOT_URL
RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES
+ARG CLANG_VER=13
+
RUN apt-get update && \
apt-get install \
autoconf \
@@ -19,7 +21,7 @@ RUN apt-get update && \
build-essential \
cabextract \
curl \
- clang-13 \
+ clang-${CLANG_VER} \
cmake \
flex \
gawk \
@@ -36,7 +38,7 @@ RUN apt-get update && \
libtool \
libucl-dev \
libxml2-dev \
- lld-13 \
+ lld-${CLANG_VER} \
msitools \
ninja-build \
openssh-client \
diff --git a/taskcluster/gecko_taskgraph/transforms/job/distro_package.py b/taskcluster/gecko_taskgraph/transforms/job/distro_package.py
@@ -223,6 +223,7 @@ def docker_worker_debian_package(config, job, taskdesc):
"buster": 10,
"bullseye": 11,
"bookworm": 12,
+ "trixie": 13,
}[run["dist"]]
common_package(config, job, taskdesc, "debian", version)
diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml
@@ -303,6 +303,45 @@ tasks:
definition: rpm-repackage
packages:
- deb12-mercurial
+ # Neither the debian13-raw nor the debian13-packages images can have
+ # packages dependencies.
+ debian13-raw:
+ symbol: I(deb13-raw)
+ definition: debian-raw
+ args:
+ BASE_IMAGE: debian:trixie-20251117
+ DIST: trixie
+ SNAPSHOT: '20251124T083047Z'
+ debian13-packages:
+ symbol: I(deb13-pkg)
+ definition: debian-packages
+ parent: debian13-raw
+ debian13-base:
+ symbol: I(deb13-base)
+ definition: debian-base
+ parent: debian13-raw
+ debian13-amd64-build:
+ symbol: I(deb13)
+ parent: debian13-base
+ definition: debian-build
+ debian13-repackage:
+ symbol: I(deb13-rpk)
+ parent: debian13-base
+ definition: debian-repackage
+ debian13-flatpak:
+ symbol: I(deb13-flatpak)
+ parent: debian13-base
+ definition: debian-flatpak
+ deb13-toolchain-build:
+ symbol: I(deb13-toolchain)
+ parent: debian13-base
+ definition: toolchain-build
+ args:
+ CLANG_VER: '19'
+ debian13-rpm-repackage:
+ symbol: I(deb13-rpm-rpk)
+ parent: debian13-base
+ definition: rpm-repackage
android-build:
symbol: I(agb)
parent: debian12-base
