Bug 1613247: Use calculated GCS bucket in mozconfig.cacche; r=firefox-build-system-reviewers,chmanchester

The code goes to some length to calculate the bucket to use, but then
hard-codes the bucket in the credential URL it uses.

Differential Revision: https://phabricator.services.mozilla.com/D61634

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Prince 2020-02-06 00:56:00 +00:00
Родитель 6e181f9551
Коммит efa6a0b1ff
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -68,7 +68,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/sccache-l${MOZ_SCM_LEVEL}-${region}@$SCCACHE_GCS_PROJECT.iam.gserviceaccount.com"
mk_add_options "export SCCACHE_GCS_CREDENTIALS_URL=http://taskcluster/auth/v1/gcp/credentials/$SCCACHE_GCS_PROJECT/${bucket}@$SCCACHE_GCS_PROJECT.iam.gserviceaccount.com"
elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
mk_add_options "export SCCACHE_GCS_BUCKET=$bucket"
else