Commit dea65134 authored by Erik Chen's avatar Erik Chen Committed by Commit Bot

Add explicit cipd credentials to mac_toolchain for official buildbot.

Buildbot is being turned down but is not fully dead yet.

Bug: 986488
Change-Id: Ibc44a0ebfe82d5f2949ddf7f62de4eefe778617c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713869
Commit-Queue: Erik Chen <erikchen@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
Auto-Submit: Erik Chen <erikchen@chromium.org>
Reviewed-by: default avatarMichael Moss <mmoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#679878}
parent 7e7f02c4
...@@ -152,6 +152,14 @@ def InstallXcodeBinaries(): ...@@ -152,6 +152,14 @@ def InstallXcodeBinaries():
args = [ args = [
'cipd', 'ensure', '-root', binaries_root, '-ensure-file', '-' 'cipd', 'ensure', '-root', binaries_root, '-ensure-file', '-'
] ]
# Buildbot slaves need to use explicit credentials. LUCI bots should NOT set
# this variable. This is temporary code used to make official Xcode bots
# happy. https://crbug.com/986488
creds = os.environ.get('MAC_TOOLCHAIN_CREDS')
if creds:
args.extend(['--service-account-json', creds])
p = subprocess.Popen( p = subprocess.Popen(
args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, args, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment