Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 04:41:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1914953 - add sccache support in northamerica-northeast1. r=ahal

Browse Source 
The service account name doesn't match the buckets, due to length limits
in gcp.

Differential Revision: https://phabricator.services.mozilla.com/D220139
This commit is contained in:
Julien Cristau 2024-08-28 16:44:54 +00:00
parent 6925889c60
commit 7721f98511
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/mozconfig.cache
View File

@ -49,6 +49,8 @@ if test -z "$bucket" -a -z "$SCCACHE_DISABLE"; then
case $cloud in
google)
bucket=${gcp_prefix}-l${MOZ_SCM_LEVEL}-${region}
# deal with length limit on serviceaccount names (https://bugzilla.mozilla.org/show_bug.cgi?id=1882374#c5)
serviceaccount=$(echo $bucket | sed s/northamerica/na/)
;;
aws)
bucket=${aws_prefix}-level-${MOZ_SCM_LEVEL}-sccache-${region}
@ -74,7 +76,7 @@ if test -n "$bucket"; then
if test "$cloud" = "google"; then
mk_add_options "export SCCACHE_GCS_BUCKET=$bucket"
mk_add_options "export SCCACHE_GCS_RW_MODE=READ_WRITE"
mk_add_options "export SCCACHE_GCS_CREDENTIALS_URL=http://taskcluster/auth/v1/gcp/credentials/$SCCACHE_GCS_PROJECT/${bucket}@$SCCACHE_GCS_PROJECT.iam.gserviceaccount.com"
mk_add_options "export SCCACHE_GCS_CREDENTIALS_URL=http://taskcluster/auth/v1/gcp/credentials/$SCCACHE_GCS_PROJECT/${serviceaccount}@$SCCACHE_GCS_PROJECT.iam.gserviceaccount.com"
elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
mk_add_options "export SCCACHE_GCS_BUCKET=$bucket"
else