Bug 1430005 - For mozharness jobs, rely on the default being set by the mozharness transform. r?dustin
The mozharness transform is supposed to set the docker image to
desktop-build when not already set, but was not doing it properly.
I guess this is why some jobs were setting the image themselves, despite
using the mozharness transform.
Consequently, don't manually set the image to desktop-build when it's
the default.
--- a/taskcluster/ci/artifact-build/kind.yml
+++ b/taskcluster/ci/artifact-build/kind.yml
@@ -22,17 +22,16 @@ jobs:
treeherder:
platform: linux64/opt
kind: build
symbol: AB
tier: 2
run-on-projects: ['trunk', 'try']
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
- docker-image: {in-tree: desktop-build}
max-run-time: 36000
run:
using: mozharness
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_sub_linux_configs/64_artifact.py
- balrog/production.py
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -141,17 +141,16 @@ macosx64-noopt/debug:
product: firefox
job-name: macosx64-noopt-debug
treeherder:
platform: osx-cross-noopt/debug
symbol: tc(B)
tier: 2
worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
worker:
- docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
config:
- builds/releng_base_firefox.py
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -36,21 +36,19 @@ job-template:
macosx64.*: [ja]
default: [ja-JP-mac]
run-time:
by-build-platform:
default: 36000
android-api-16-l10n: 18000
docker-image:
by-build-platform:
- default:
- in-tree: desktop-build
android-api-16-l10n:
in-tree: android-build
- win.*: null
+ default: null
secrets:
by-build-platform:
default: false
android-api-16-l10n: true
toolchains:
by-build-platform:
default: []
macosx64:
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -46,21 +46,19 @@ job-template:
macosx64.*: [ja]
default: [ja-JP-mac]
run-time:
by-build-platform:
default: 36000
android-api-16-nightly: 18000
docker-image:
by-build-platform:
- default:
- in-tree: desktop-build
android-api-16-nightly:
in-tree: android-build
- win.*: null
+ default: null
secrets:
by-build-platform:
default: false
android-api-16-nightly: true
toolchains:
by-build-platform:
default: []
macosx64.*:
--- a/taskcluster/ci/searchfox/kind.yml
+++ b/taskcluster/ci/searchfox/kind.yml
@@ -26,17 +26,16 @@ jobs:
linux64-searchfox/debug:
description: "Linux64 Debug Searchfox"
index:
job-name: linux64-searchfox-debug
treeherder:
platform: linux64/debug
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
- docker-image: {in-tree: desktop-build}
max-run-time: 36000
run:
using: mozharness
actions: [clobber build]
config:
- builds/releng_base_firefox.py
- builds/releng_sub_linux_configs/64_searchfox_and_debug.py
- balrog/production.py
@@ -50,17 +49,16 @@ jobs:
macosx64-searchfox/debug:
description: "MacOS X x64 Debug Cross-compile Searchfox"
index:
job-name: macosx64-searchfox-debug
treeherder:
platform: osx-cross/debug
worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
worker:
- docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [clobber get-secrets build update]
config:
- builds/releng_base_firefox.py
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@@ -25,17 +25,16 @@ jobs:
linux64-st-an/debug:
description: "Linux64 Debug Static Analysis"
index:
job-name: linux64-st-an-debug
treeherder:
platform: linux64/debug
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
- docker-image: {in-tree: desktop-build}
max-run-time: 36000
run:
using: mozharness
actions: [build]
config:
- builds/releng_base_firefox.py
- builds/releng_sub_linux_configs/64_stat_and_debug.py
- balrog/production.py
@@ -50,17 +49,16 @@ jobs:
linux64-st-an/opt:
description: "Linux64 Opt Static Analysis"
index:
job-name: linux64-st-an-opt
treeherder:
platform: linux64/opt
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
- docker-image: {in-tree: desktop-build}
max-run-time: 36000
run:
using: mozharness
actions: [build]
config:
- builds/releng_base_firefox.py
- builds/releng_sub_linux_configs/64_stat_and_opt.py
- balrog/production.py
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -131,18 +131,17 @@ def mozharness_on_docker_worker_setup(co
"'use-simple-package' on docker-workers")
if not run['use-magic-mh-args']:
raise NotImplementedError("Cannot disabled mh magic arg passing via"
"'use-magic-mh-args' on docker-workers")
# Running via mozharness assumes an image that contains build.sh:
# by default, desktop-build, but it could be another image (like
# android-build) that "inherits" from desktop-build.
- if not taskdesc['worker']['docker-image']:
- taskdesc['worker']['docker-image'] = {"in-tree": "desktop-build"}
+ taskdesc['worker'].setdefault('docker-image', {'in-tree': 'desktop-build'})
worker['taskcluster-proxy'] = run.get('taskcluster-proxy')
docker_worker_add_public_artifacts(config, job, taskdesc)
docker_worker_add_workspace_cache(config, job, taskdesc,
extra=run.get('extra-workspace-cache-key'))
support_vcs_checkout(config, job, taskdesc)
