Bug 1850045: fix bustage introduced by taskgraph 6.2.1 update r=ahal,taskgraph-reviewers,releng-reviewers

This is only sortof a new issue - it's come up because we longer allow `group_by` functions to be overridden, and the taskgraph version of the `single` group doesn't handle the `only-for` blocks that we use all over the place.

This patch provides a quick fix -- renaming the Gecko `single` group-by to `single-with-filters`, and using that in most places. (There were a couple of places that switching to `with-attributes` was simple enough - but in many cases we cannot yet replicate this functionality with `from-deps` alone AFAIK.)

Differential Revision: https://phabricator.services.mozilla.com/D186821
This commit is contained in:
Ben Hearsum 2023-09-06 13:30:45 +00:00
parent c1a3964427
commit 4e29477066
32 changed files with 62 additions and 33 deletions

View File

@ -21,6 +21,7 @@ only-for-build-platforms:
jobs:
beetmover-apt:
from-deps: {}
from-deps:
group-by: single-with-filters
run-on-releases:
- nightly

View File

@ -19,7 +19,8 @@ only-for-attributes:
jobs:
beetmover-checksums:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
attributes:
artifact_prefix: public

View File

@ -38,7 +38,8 @@ not-for-build-platforms:
jobs:
beetmover-geckoview:
from-deps: {}
from-deps:
group-by: single-with-filters
attributes:
artifact_map: taskcluster/gecko_taskgraph/manifests/fennec_geckoview.yml
run-on-projects: ['mozilla-release']

View File

@ -16,7 +16,8 @@ kind-dependencies:
jobs:
beetmover-source:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
attributes:
artifact_map: taskcluster/gecko_taskgraph/manifests/source_files.yml

View File

@ -20,6 +20,7 @@ only-for-attributes:
jobs:
build-mac-notarization:
from-deps:
group-by: single-with-filters
copy-attributes: true
treeherder:
symbol: BMN

View File

@ -25,7 +25,8 @@ only-for-build-platforms:
jobs:
build-mac-signing:
from-deps: {}
from-deps:
group-by: single-with-filters
treeherder:
symbol: BMS
enable-signing-routes: false

View File

@ -21,7 +21,8 @@ jobs:
fxrecord:
name: notify-fxrecord-failure
description: "Desktop Startup Visual Metrics"
from-deps: {}
from-deps:
group-by: single-with-filters
run-on-projects:
- "mozilla-central"
worker-type: performance-hardware/gecko-t-fxrecorder

View File

@ -13,9 +13,8 @@ transforms:
kind-dependencies:
- toolchain
only-for-attributes:
- geckodriver
jobs:
geckodriver-signing:
from-deps: {}
from-deps:
with-attributes:
geckodriver: [true]

View File

@ -18,7 +18,8 @@ only-for-build-platforms:
jobs:
mar-signing-autograph-stage:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: null
treeherder-group: ms-stage
treeherder:

View File

@ -30,7 +30,8 @@ only-for-build-platforms:
jobs:
mar-signing-l10n:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
treeherder-group: ms
description-suffix: 'mar signing'

View File

@ -31,7 +31,8 @@ only-for-build-platforms:
jobs:
mar-signing:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
treeherder-group: ms
description-suffix: 'mar signing'

View File

@ -15,7 +15,8 @@ kind-dependencies:
jobs:
partials-signing:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
treeherder-group: ps
description-suffix: 'partial signing'

View File

@ -34,5 +34,6 @@ only-for-build-platforms:
jobs:
partials:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote

View File

@ -15,7 +15,8 @@ kind-dependencies:
jobs:
release-beetmover-signed-langpacks-checksums:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
attributes:
artifact_prefix: public

View File

@ -20,7 +20,8 @@ only-for-build-platforms:
jobs:
release-eme-free-repack-beetmover:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
partner-bucket-scope:
by-release-level:

View File

@ -20,4 +20,5 @@ only-for-build-platforms:
jobs:
release-eme-free-repack-repackage-signing:
from-deps: {}
from-deps:
group-by: single-with-filters

View File

@ -26,7 +26,8 @@ only-for-build-platforms:
jobs:
release-eme-free-repack-repackage:
from-deps: {}
from-deps:
group-by: single-with-filters
upstream-mac-kind:
by-build-type:
debug: release-eme-free-repack-mac-signing

View File

@ -24,7 +24,8 @@ only-for-build-platforms:
jobs:
release-partner-repack-beetmover:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
partner-bucket-scope:
by-release-level:

View File

@ -25,4 +25,5 @@ only-for-build-platforms:
jobs:
release-partner-repack-repackage-signing:
from-deps: {}
from-deps:
group-by: single-with-filters

View File

@ -27,7 +27,8 @@ only-for-build-platforms:
jobs:
release-partner-repack-repackage:
from-deps: {}
from-deps:
group-by: single-with-filters
upstream-mac-kind:
by-build-type:
debug: release-partner-repack-mac-signing

View File

@ -23,7 +23,8 @@ only-for-build-platforms:
jobs:
repackage-deb-l10n:
from-deps: {}
from-deps:
group-by: single-with-filters
worker-type: b-linux-gcp
worker:
docker-image: {"in-tree": "debian12-repackage"}

View File

@ -28,7 +28,8 @@ only-for-attributes:
jobs:
repackage-deb:
from-deps: {}
from-deps:
group-by: single-with-filters
shipping-phase: promote
worker-type: b-linux-gcp
worker:

View File

@ -35,7 +35,8 @@ only-for-build-platforms:
jobs:
repackage-l10n:
from-deps: {}
from-deps:
group-by: single-with-filters
upstream-mac-kind:
by-build-type:
debug: shippable-l10n-mac-signing

View File

@ -25,7 +25,8 @@ only-for-build-platforms:
jobs:
repackage-msi:
worker-type: 'b-win2022'
from-deps: {}
from-deps:
group-by: single-with-filters
mozharness:
use-magic-mh-args: false
config:

View File

@ -27,4 +27,5 @@ only-for-build-platforms:
jobs:
repackage-signing-l10n:
from-deps: {}
from-deps:
group-by: single-with-filters

View File

@ -23,4 +23,5 @@ only-for-build-platforms:
jobs:
repackage-signing-msi:
from-deps: {}
from-deps:
group-by: single-with-filters

View File

@ -15,4 +15,5 @@ kind-dependencies:
jobs:
repackage-signing-msix:
from-deps: {}
from-deps:
group-by: single-with-filters

View File

@ -25,4 +25,5 @@ only-for-build-platforms:
jobs:
repackage-signing:
from-deps: {}
from-deps:
group-by: single-with-filters

View File

@ -43,7 +43,8 @@ only-for-build-platforms:
jobs:
repackage:
from-deps: {}
from-deps:
group-by: single-with-filters
upstream-mac-kind:
by-build-type:
debug: build-mac-signing

View File

@ -21,5 +21,6 @@ kind-dependencies:
jobs:
upload-generated-sources-dummy:
description: Dummy task to pull in mac x64 and aarch64 upload-generated-symbols tasks
from-deps: {}
from-deps:
group-by: single-with-filters
worker-type: succeed

View File

@ -22,5 +22,6 @@ jobs:
upload-symbols-dummy:
description: Dummy task to pull in mac x64 and aarch64 upload-symbols tasks
from-deps:
group-by: single-with-filters
unique-kinds: false
worker-type: succeed

View File

@ -32,7 +32,7 @@ def skip_only_or_not(config, task):
return False
@group_by("single")
@group_by("single-with-filters")
def single_grouping(config, tasks):
for task in tasks:
if skip_only_or_not(config.config, task):