From 65745dbb4a722e73fb2d924de6a19fd959c947aa Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 2 Mar 2021 08:17:03 +0000 Subject: [PATCH] Bug 1694785 - Upgrade Linux builders to Debian buster. r=firefox-build-system-reviewers,mhentges Because we use sysroots, this makes no difference to the shipped builds. This would normally allow to remove the debian8-amd64-build docker image, but we need to keep it for the valgrind jobs for now. Differential Revision: https://phabricator.services.mozilla.com/D106404 --- taskcluster/ci/addon/kind.yml | 2 +- taskcluster/ci/docker-image/kind.yml | 2 +- taskcluster/ci/hazard/kind.yml | 2 +- taskcluster/ci/l10n/kind.yml | 5 +---- taskcluster/ci/repackage-l10n/kind.yml | 2 +- taskcluster/ci/repackage/kind.yml | 2 +- taskcluster/ci/shippable-l10n/kind.yml | 5 +---- taskcluster/ci/source-test/codeql.yml | 2 +- taskcluster/ci/source-test/file-metadata.yml | 8 ++++---- taskcluster/ci/spidermonkey/linux.yml | 2 +- taskcluster/taskgraph/transforms/build.py | 2 +- taskcluster/taskgraph/transforms/job/mozharness.py | 4 ++-- taskcluster/taskgraph/transforms/repackage_partner.py | 2 +- 13 files changed, 17 insertions(+), 23 deletions(-) diff --git a/taskcluster/ci/addon/kind.yml b/taskcluster/ci/addon/kind.yml index 1d47f88c6e81..d1fd9883b078 100644 --- a/taskcluster/ci/addon/kind.yml +++ b/taskcluster/ci/addon/kind.yml @@ -22,7 +22,7 @@ jobs: run-on-projects: [mozilla-central] worker-type: b-linux worker: - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} max-run-time: 1800 artifacts: - type: file diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml index bb6746912950..61cf236ca279 100644 --- a/taskcluster/ci/docker-image/kind.yml +++ b/taskcluster/ci/docker-image/kind.yml @@ -123,7 +123,7 @@ jobs: parent: debian10-base gdb-test: symbol: I(gdb) - parent: debian8-amd64-build + parent: debian10-amd64-build definition: gdb-test mingw32-build: symbol: I(mingw) diff --git a/taskcluster/ci/hazard/kind.yml b/taskcluster/ci/hazard/kind.yml index 3e85f641169b..bda4d3ec7bd6 100644 --- a/taskcluster/ci/hazard/kind.yml +++ b/taskcluster/ci/hazard/kind.yml @@ -22,7 +22,7 @@ job-defaults: worker-type: b-linux worker: max-run-time: 36000 - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} jobs: linux64-shell-haz/debug: diff --git a/taskcluster/ci/l10n/kind.yml b/taskcluster/ci/l10n/kind.yml index 3bfd84d6d809..1b1b4cb6b3c6 100644 --- a/taskcluster/ci/l10n/kind.yml +++ b/taskcluster/ci/l10n/kind.yml @@ -75,10 +75,7 @@ job-template: linux-shippable.*: ['release'] # Do not run on autoland - Bug 1599197 default: ['all'] worker-type: b-linux - docker-image: - by-build-platform: - linux.*: {in-tree: debian8-amd64-build} - default: {in-tree: debian10-amd64-build} + docker-image: {in-tree: debian10-amd64-build} treeherder: symbol: L10n tier: 1 diff --git a/taskcluster/ci/repackage-l10n/kind.yml b/taskcluster/ci/repackage-l10n/kind.yml index 1efc0948a693..10a12df8a6a9 100644 --- a/taskcluster/ci/repackage-l10n/kind.yml +++ b/taskcluster/ci/repackage-l10n/kind.yml @@ -32,7 +32,7 @@ only-for-build-platforms: job-template: worker-type: 'b-linux' worker: - docker-image: {"in-tree": "debian8-amd64-build"} + docker-image: {"in-tree": "debian10-amd64-build"} mozharness: config: by-build-platform: diff --git a/taskcluster/ci/repackage/kind.yml b/taskcluster/ci/repackage/kind.yml index e06ca483b6de..cd66d9b0ab0c 100644 --- a/taskcluster/ci/repackage/kind.yml +++ b/taskcluster/ci/repackage/kind.yml @@ -39,7 +39,7 @@ only-for-build-platforms: job-template: worker-type: 'b-linux' worker: - docker-image: {"in-tree": "debian8-amd64-build"} + docker-image: {"in-tree": "debian10-amd64-build"} mozharness: config: by-build-platform: diff --git a/taskcluster/ci/shippable-l10n/kind.yml b/taskcluster/ci/shippable-l10n/kind.yml index 9aab453f1d3c..c0e9f10917c5 100644 --- a/taskcluster/ci/shippable-l10n/kind.yml +++ b/taskcluster/ci/shippable-l10n/kind.yml @@ -91,10 +91,7 @@ job-template: win64-devedition: win64-devedition-opt win64-aarch64-devedition: win64-aarch64-devedition-opt worker-type: b-linux - docker-image: - by-build-platform: - linux.*: {in-tree: debian8-amd64-build} - default: {in-tree: debian10-amd64-build} + docker-image: {in-tree: debian10-amd64-build} treeherder: symbol: L10n(B) tier: 1 diff --git a/taskcluster/ci/source-test/codeql.yml b/taskcluster/ci/source-test/codeql.yml index 92843560beae..f241ceb8d01b 100644 --- a/taskcluster/ci/source-test/codeql.yml +++ b/taskcluster/ci/source-test/codeql.yml @@ -12,7 +12,7 @@ javascript: worker-type: b-linux-xlarge expires-after: 4 days worker: - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} max-run-time: 86400 artifacts: - type: file diff --git a/taskcluster/ci/source-test/file-metadata.yml b/taskcluster/ci/source-test/file-metadata.yml index 2db24279dec8..82801f971dbf 100644 --- a/taskcluster/ci/source-test/file-metadata.yml +++ b/taskcluster/ci/source-test/file-metadata.yml @@ -44,7 +44,7 @@ test-info-fission: product: source job-name: test-info-fission worker: - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} run-on-projects: ['mozilla-central'] fetches: toolchain: @@ -70,7 +70,7 @@ test-info-xorigin: product: source job-name: test-info-xorigin worker: - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} run-on-projects: ['mozilla-central'] fetches: toolchain: @@ -96,7 +96,7 @@ test-info-disabled-by-os: product: source job-name: test-info-disabled-by-os worker: - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} run-on-projects: ['mozilla-central'] fetches: toolchain: @@ -125,7 +125,7 @@ test-info-all: product: source job-name: test-info-all worker: - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} max-run-time: 5400 run-on-projects: ['mozilla-central'] fetches: diff --git a/taskcluster/ci/spidermonkey/linux.yml b/taskcluster/ci/spidermonkey/linux.yml index a3ff812f42e2..813e8c8ab4e0 100644 --- a/taskcluster/ci/spidermonkey/linux.yml +++ b/taskcluster/ci/spidermonkey/linux.yml @@ -5,7 +5,7 @@ job-defaults: worker: max-run-time: 36000 - docker-image: {in-tree: debian8-amd64-build} + docker-image: {in-tree: debian10-amd64-build} env: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/jsshell.manifest" MOZ_AUTOMATION_UPLOAD: "0" diff --git a/taskcluster/taskgraph/transforms/build.py b/taskcluster/taskgraph/transforms/build.py index ac6f65d2ac96..a625c772ee3f 100644 --- a/taskcluster/taskgraph/transforms/build.py +++ b/taskcluster/taskgraph/transforms/build.py @@ -36,7 +36,7 @@ def set_defaults(config, jobs): worker.setdefault("env", {}) worker["chain-of-trust"] = True if worker_os == "linux": - worker.setdefault("docker-image", {"in-tree": "debian8-amd64-build"}) + worker.setdefault("docker-image", {"in-tree": "debian10-amd64-build"}) yield job diff --git a/taskcluster/taskgraph/transforms/job/mozharness.py b/taskcluster/taskgraph/transforms/job/mozharness.py index 0b1da061cddb..fe3558893a6c 100644 --- a/taskcluster/taskgraph/transforms/job/mozharness.py +++ b/taskcluster/taskgraph/transforms/job/mozharness.py @@ -140,9 +140,9 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc): ) # Running via mozharness assumes an image that contains build.sh: - # by default, debian8-amd64-build, but it could be another image (like + # by default, debian10-amd64-build, but it could be another image (like # android-build). - worker.setdefault("docker-image", {"in-tree": "debian8-amd64-build"}) + worker.setdefault("docker-image", {"in-tree": "debian10-amd64-build"}) worker.setdefault("artifacts", []).append( { diff --git a/taskcluster/taskgraph/transforms/repackage_partner.py b/taskcluster/taskgraph/transforms/repackage_partner.py index 697e788f9533..f0d6783a95b3 100644 --- a/taskcluster/taskgraph/transforms/repackage_partner.py +++ b/taskcluster/taskgraph/transforms/repackage_partner.py @@ -175,7 +175,7 @@ def make_job_description(config, jobs): } worker_type = "b-linux" - worker["docker-image"] = {"in-tree": "debian8-amd64-build"} + worker["docker-image"] = {"in-tree": "debian10-amd64-build"} worker["artifacts"] = _generate_task_output_files( dep_job,