diff options
| author |  jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2019-05-17 12:47:11 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-05-17 12:47:11 -0700 |
| commit | bdd9519f44ffd12841b1f8d214ac96a2353d881a (patch) | |
| tree | b88b02d5c86b9dcbb4e2d9a3ebdb1d842569345e /infra/gcb | |
| parent | 9dd5af0b0166aabd71ca68bf717d628b15b8d101 (diff) | |
[i386] Use different bucket for i386 builds. (#2435)
Diffstat (limited to 'infra/gcb')
| -rw-r--r-- | infra/gcb/build_project.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/infra/gcb/build_project.py b/infra/gcb/build_project.py index d35f1d0c..cd466f3f 100644 --- a/infra/gcb/build_project.py +++ b/infra/gcb/build_project.py @@ -76,7 +76,6 @@ DEFAULT_SANITIZERS = ['address', 'undefined'] TARGETS_LIST_BASENAME = 'targets.list' UPLOAD_URL_FORMAT = '/{0}/{1}/{2}' -NON_X86_64_UPLOAD_URL_FORMAT = '/{0}/{1}/{2}/{3}' def usage(): @@ -218,18 +217,12 @@ def get_build_steps(project_dir): zip_file = stamped_name + '.zip' stamped_srcmap_file = stamped_name + '.srcmap.json' bucket = ENGINE_INFO[fuzzing_engine].upload_bucket - if architecture == 'x86_64': - upload_url = get_signed_url( - UPLOAD_URL_FORMAT.format(bucket, name, zip_file)) - srcmap_url = get_signed_url( - UPLOAD_URL_FORMAT.format(bucket, name, stamped_srcmap_file)) - else: - upload_url = get_signed_url( - NON_X86_64_UPLOAD_URL_FORMAT.format(bucket, name, architecture, - zip_file)) - srcmap_url = get_signed_url( - NON_X86_64_UPLOAD_URL_FORMAT.format(bucket, name, architecture, - stamped_srcmap_file)) + if architecture != 'x86_64': + bucket += '-' + architecture + upload_url = get_signed_url( + UPLOAD_URL_FORMAT.format(bucket, name, zip_file)) + srcmap_url = get_signed_url( + UPLOAD_URL_FORMAT.format(bucket, name, stamped_srcmap_file)) targets_list_filename = get_targets_list_filename(sanitizer) targets_list_url = get_signed_url( |