Merge mozilla-central to autoland.
authorCosmin Sabou <csabou@mozilla.com>
Wed, 15 Jan 2020 11:43:36 +0200
changeset 510319 af8308da601a34e3b50eeb4b1eab306cba176220
parent 510318 31452e26c2b3300c4b66fe19ca0aba1590c834ed (current diff)
parent 510297 5ba39736e74b8a072a63ee215545f89d5c2ec8c8 (diff)
child 510320 a45217d42c6dab49b35b1a6737f7241a41b51e11
push id37018
push usercsabou@mozilla.com
push dateWed, 15 Jan 2020 15:47:40 +0000
treeherdermozilla-central@28abd2840682 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone74.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland.
--- a/taskcluster/ci/system-symbols-upload/kind.yml
+++ b/taskcluster/ci/system-symbols-upload/kind.yml
@@ -18,12 +18,12 @@ job-template:
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 900
         env:
             # {level} gets replaced in the upload_symbols transform
             SYMBOL_SECRET: "project/releng/gecko/build/level-{level}/gecko-symbol-upload"
     run:
         using: mach
-        mach: {artifact-reference: "python toolkit/crashreporter/tools/upload_symbols.py <build/public/build/target.crashreporter-symbols.zip> --ignore-missing"}
+        mach: {artifact-reference: "python toolkit/crashreporter/tools/upload_symbols.py <build/public/build/target.crashreporter-symbols.zip>"}
         sparse-profile: upload-symbols
     scopes:
         - secrets:get:project/releng/gecko/build/level-{level}/gecko-symbol-upload
--- a/toolkit/crashreporter/tools/upload_symbols.py
+++ b/toolkit/crashreporter/tools/upload_symbols.py
@@ -63,34 +63,21 @@ def main():
     import redo
     import requests
 
     logging.basicConfig()
     parser = argparse.ArgumentParser(
         description='Upload symbols in ZIP using token from Taskcluster secrets service.')
     parser.add_argument('zip',
                         help='Symbols zip file - URL or path to local file')
-    parser.add_argument('--ignore-missing',
-                        help='No error on missing files',
-                        action='store_true')
     args = parser.parse_args()
 
-    if args.zip.startswith('http'):
-        resp = requests.head(args.zip)
-        is_missing = resp.status_code != requests.codes.ok
-    else:
-        is_missing = not os.path.isfile(args.zip)
-
-    if is_missing:
-        if args.ignore_missing:
-            log.info('Zip file "{0}" does not exist!'.format(args.zip))
-            return 0
-        else:
-            log.error('Error: zip file "{0}" does not exist!'.format(args.zip))
-            return 1
+    if not args.zip.startswith('http') and not os.path.isfile(args.zip):
+        log.error('Error: zip file "{0}" does not exist!'.format(args.zip))
+        return 1
 
     secret_name = os.environ.get('SYMBOL_SECRET')
     if secret_name is not None:
         auth_token = get_taskcluster_secret(secret_name)
     elif 'SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE' in os.environ:
         token_file = os.environ['SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE']
 
         if not os.path.isfile(token_file):