From cd28aa2e7e62de130f626a3cdacb6d437222a791 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx+mozillians@lissyx.dyndns.org>
Date: Mon, 17 Jul 2023 15:13:11 +0000
Subject: [PATCH] Bug 1839317 - Add Ubuntu 22.04 image and packages
 r=releng-reviewers,taskgraph-reviewers,jcristau

Differential Revision: https://phabricator.services.mozilla.com/D181730
---
 taskcluster/ci/config.yml                          |  1 +
 taskcluster/ci/docker-image/kind.yml               | 16 +++++++++++++
 taskcluster/ci/packages/ubuntu.yml                 | 27 ++++++++++++++++++++++
 .../transforms/job/distro_package.py               |  1 +
 4 files changed, 45 insertions(+)

diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 86db1583e816..4a84e9b47197 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -163,6 +163,7 @@ treeherder:
         'Deb12': 'Packages for Debian 12'
         'Ub18': 'Packages for Ubuntu 18.04'
         'Ub20': 'Packages for Ubuntu 20.04'
+        'Ub22': 'Packages for Ubuntu 22.04'
         'I': 'Docker Image Builds'
         'TA': 'Toolchain builds for Android'
         'TL': 'Toolchain builds for Linux 64-bits'
diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml
index c3b6bc4c9b1f..0393aeb0f8ae 100644
--- a/taskcluster/ci/docker-image/kind.yml
+++ b/taskcluster/ci/docker-image/kind.yml
@@ -66,10 +66,19 @@ jobs:
         definition: debian-raw
         args:
             BASE_IMAGE: ubuntu:focal
+    ubuntu2204-raw:
+        symbol: I(ub22-raw)
+        definition: debian-raw
+        args:
+            BASE_IMAGE: ubuntu:jammy
     ubuntu2004-packages:
         symbol: I(ub20-pkg)
         definition: debian-packages
         parent: ubuntu2004-raw
+    ubuntu2204-packages:
+        symbol: I(ub22-pkg)
+        definition: debian-packages
+        parent: ubuntu2204-raw
     ubuntu2004-base:
         symbol: I(ub20-base)
         definition: debian-base
@@ -77,6 +86,13 @@ jobs:
         packages:
             - ub20-mercurial
             - ub20-python-zstandard
+    ubuntu2204-base:
+        symbol: I(ub22-base)
+        definition: debian-base
+        parent: ubuntu2204-raw
+        packages:
+            - ub22-mercurial
+            - ub22-python-zstandard
     # Neither the debian8-*raw nor the debian8-*packages images can have
     # packages dependencies.
     debian8-raw:
diff --git a/taskcluster/ci/packages/ubuntu.yml b/taskcluster/ci/packages/ubuntu.yml
index 60f8eef25f84..dcc7b7d148b4 100644
--- a/taskcluster/ci/packages/ubuntu.yml
+++ b/taskcluster/ci/packages/ubuntu.yml
@@ -98,3 +98,30 @@ ub20-mercurial:
             sed -i -e "s/__VERSION__/$(awk -F\" '$2 {print $2}' mercurial/__version__.py)-1.ub20moz1/" \
                          -e "s/__DATE__/$(date --rfc-2822)/" \
                          -e "s/__CODENAME__/focal/" debian/changelog
+
+ub22-python-zstandard:
+    description: "python-zstandard for Ubuntu jammy"
+    treeherder:
+        symbol: Ub22(python-zstandard)
+    run:
+        tarball:
+            url: https://github.com/indygreg/python-zstandard/releases/download/0.19.0/zstandard-0.19.0.tar.gz
+            sha256: 31d12fcd942dd8dbf52ca5f6b1bbe287f44e5d551a081a983ff3ea2082867863
+        name: python-zstandard
+        dist: jammy
+        pre-build-command: debchange -v 0.19.0-1.ub22moz --distribution jammy "Mozilla backport for jammy"
+
+ub22-mercurial:
+    description: "Modern Mercurial for Ubuntu jammy"
+    treeherder:
+        symbol: Ub22(hg)
+    run:
+        tarball:
+            url: https://www.mercurial-scm.org/release/mercurial-6.4.3.tar.gz
+            sha256: a77fb62d325934a83a00b2fc6db109f44c67b86768fc40490366f513640c7f64
+        dist: jammy
+        pre-build-command: >-
+            cp -r contrib/packaging/debian debian &&
+            sed -i -e "s/__VERSION__/$(awk -F\" '$2 {print $2}' mercurial/__version__.py)-1.ub22moz1/" \
+                         -e "s/__DATE__/$(date --rfc-2822)/" \
+                         -e "s/__CODENAME__/jammy/" debian/changelog
diff --git a/taskcluster/gecko_taskgraph/transforms/job/distro_package.py b/taskcluster/gecko_taskgraph/transforms/job/distro_package.py
index fe100a390abf..c9d0d1d51878 100644
--- a/taskcluster/gecko_taskgraph/transforms/job/distro_package.py
+++ b/taskcluster/gecko_taskgraph/transforms/job/distro_package.py
@@ -235,5 +235,6 @@ def docker_worker_ubuntu_package(config, job, taskdesc):
     version = {
         "bionic": 1804,
         "focal": 2004,
+        "jammy": 2204,
     }[run["dist"]]
     common_package(config, job, taskdesc, "ubuntu", version)
-- 
2.11.4.GIT