Skip to content

Commit

Permalink
ci: fix scope prefix in beetmover apt task (#9905) (#9921)
Browse files Browse the repository at this point in the history
Co-authored-by: Andrew Halberstadt <[email protected]>
  • Loading branch information
oskirby and ahal authored Sep 27, 2024
1 parent 205b888 commit d6d30f8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
5 changes: 5 additions & 0 deletions taskcluster/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,10 @@ release-promotion:
- toolchain
- toolchain-openssl

scriptworker:
scope-prefix: project:mozillavpn:releng

shipit:
# TODO: Remove this when using mozilla-taskgraph 2.1 or higher. It'll use
# the 'scriptworker' config above then.
scope-prefix: project:mozillavpn:releng:ship-it
7 changes: 3 additions & 4 deletions taskcluster/mozillavpn_taskgraph/transforms/beetmover_apt.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,13 @@ def beetmover_apt(config, tasks):

if task["attributes"]["shipping-phase"] == "ship-client":
bucket = "release"
project_name = "mozillavpn"
else:
bucket = "dep"
project_name = "mozillavpn:releng"

scope_prefix = config.graph_config["scriptworker"]["scope-prefix"]
task["scopes"] = [
f"project:{project_name}:beetmover:apt-repo:{bucket}",
f"project:{project_name}:beetmover:action:import-from-gcs-to-artifact-registry"
f"{scope_prefix}:beetmover:apt-repo:{bucket}",
f"{scope_prefix}:beetmover:action:import-from-gcs-to-artifact-registry"
]

task["label"] = f"beetmover-apt-{task['name']}"
Expand Down

0 comments on commit d6d30f8

Please sign in to comment.