Bug 1726117 - Add Debian 11-based Docker images. r=taskgraph-reviewers,bhearsum

Differential Revision: https://phabricator.services.mozilla.com/D122830
This commit is contained in:
Mike Hommey 2021-08-18 03:42:47 +00:00
Родитель 905140c246
Коммит 799e664ee9
4 изменённых файлов: 63 добавлений и 1 удалений

Просмотреть файл

@ -118,6 +118,7 @@ treeherder:
'Deb8-32': 'Packages for Debian 8 32-bits'
'Deb9': 'Packages for Debian 9'
'Deb10': 'Packages for Debian 10'
'Deb11': 'Packages for Debian 11'
'Ub18': 'Packages for Ubuntu 18.04'
'Ub20': 'Packages for Ubuntu 20.04'
'I': 'Docker Image Builds'

Просмотреть файл

@ -148,6 +148,34 @@ jobs:
parent: debian10-test
packages:
- deb10-python-zstandard
# Neither the debian11-raw nor the debian11-packages images can have
# packages dependencies.
debian11-raw:
symbol: I(deb11-raw)
definition: debian-raw
args:
BASE_IMAGE: debian:bullseye-20210816
DIST: bullseye
SNAPSHOT: '20210816T214117Z'
debian11-packages:
symbol: I(deb11-pkg)
definition: debian-packages
parent: debian11-raw
debian11-base:
symbol: I(deb11-base)
definition: debian-base
parent: debian11-raw
packages:
- deb11-mercurial
- deb11-python-zstandard
debian11-amd64-build:
symbol: I(deb11)
parent: debian11-base
definition: debian-build
deb11-toolchain-build:
symbol: I(deb11-toolchain)
parent: debian11-base
definition: toolchain-build
android-build:
symbol: I(agb)
parent: debian10-base

Просмотреть файл

@ -33,6 +33,22 @@ deb10-mercurial:
-e "s/__DATE__/$(date --rfc-2822)/" \
-e "s/__CODENAME__/buster/" debian/changelog
deb11-mercurial:
description: "Modern Mercurial for Debian bullseye"
treeherder:
symbol: Deb11(hg)
run:
using: debian-package
dist: bullseye
tarball:
url: https://www.mercurial-scm.org/release/mercurial-5.8.1.tar.gz
sha256: 81baa3fe2087bdda2dd119d7ea948f6badebaeb7b528a7d18b277e2ceb22b19b
pre-build-command: >-
cp -r contrib/packaging/debian debian &&
sed -i -e "s/__VERSION__/$(awk -F\" '$2 {print $2}' mercurial/__version__.py)-1.deb11moz1/" \
-e "s/__DATE__/$(date --rfc-2822)/" \
-e "s/__CODENAME__/bullseye/" debian/changelog
deb10-valgrind:
description: "Valgrind for Debian buster"
treeherder:
@ -56,6 +72,19 @@ deb10-python-zstandard:
pre-build-command: debchange -v 0.15.2-1.deb10moz --distribution buster "Mozilla backport for buster"
name: python-zstandard
deb11-python-zstandard:
description: "python-zstandard for Debian bullseye"
treeherder:
symbol: Deb11(python-zstandard)
run:
using: debian-package
dist: bullseye
tarball:
url: https://github.com/indygreg/python-zstandard/releases/download/0.15.2/zstandard-0.15.2.tar.gz
sha256: 52de08355fd5cfb3ef4533891092bb96229d43c2069703d4aff04fdbedf9c92f
pre-build-command: debchange -v 0.15.2-1.deb11moz --distribution bullseye "Mozilla backport for buster"
name: python-zstandard
deb10-mmdebstrap:
# Only a more recent version of mmdebstrap than what is in buster has the
# features we want.

Просмотреть файл

@ -16,7 +16,7 @@ ARG DIST
ARG SNAPSHOT
ARG TASKCLUSTER_ROOT_URL
# Set apt sources list to a snapshot.
RUN if [ -n "$SNAPSHOT" -a -n "$DIST" ]; then for s in debian_$DIST debian_$DIST-updates debian_$DIST-backports debian-security_$DIST/updates debian-debug_$DIST-debug debian-debug_$DIST-proposed-updates-debug debian-debug_$DIST-backports-debug; do \
RUN if [ -n "$SNAPSHOT" -a -n "$DIST" ]; then for s in debian_$DIST debian_$DIST-updates debian_$DIST-backports debian-security_$DIST-security debian-debug_$DIST-debug debian-debug_$DIST-proposed-updates-debug debian-debug_$DIST-backports-debug; do \
case "$s" in \
debian_jessie-backports) \
echo "deb http://snapshot.debian.org/archive/debian-archive/20190328T105444Z/debian/ ${s#*_} main"; \
@ -24,6 +24,10 @@ RUN if [ -n "$SNAPSHOT" -a -n "$DIST" ]; then for s in debian_$DIST debian_$DIST
debian-debug_jessie*) \
: No debian-debug archive for Jessie; \
;; \
debian-security_jessie-security|debian-security_buster-security) \
d=${s#*_}; \
echo "deb http://snapshot.debian.org/archive/${s%_*}/$SNAPSHOT/ ${d%-security}/updates main"; \
;; \
*) \
echo "deb http://snapshot.debian.org/archive/${s%_*}/$SNAPSHOT/ ${s#*_} main"; \
;; \