Backed out 2 changesets (bug 1870823) for causing build bustages CLOSED TREE

Backed out changeset 8e71522c5b0c (bug 1870823)
Backed out changeset bf23686d4852 (bug 1870823)

taskcluster/ci/fetch/toolchains.yml

@@ -428,7 +428,7 @@ dump-syms:
     fetch:
         type: git
         repo: https://github.com/mozilla/dump_syms/
-        revision: 96c647f0a63912b68b0bc2613cef77d9b3f305fd
+        revision: b1951e4ccec48a2e97460a7ec40be35aa79e0037
 
 rust-minidump:
     description: rust-minidump 0.19.1 source code (for minidump-stackwalk)

taskcluster/ci/toolchain/dump-syms.yml

@@ -24,7 +24,7 @@ linux64-dump_syms:
     fetches:
         toolchain:
             - linux64-clang-toolchain
-            - linux64-rust
+            - linux64-rust-toolchain
             - sysroot-x86_64-linux-gnu
 
 macosx64-dump_syms:
@@ -35,7 +35,7 @@ macosx64-dump_syms:
         arguments: ['x86_64-apple-darwin']
     fetches:
         toolchain:
-            - linux64-rust-macos
+            - linux64-rust-macos-toolchain
             - linux64-clang-toolchain
             - macosx64-sdk-toolchain
 
@@ -46,7 +46,7 @@ macosx64-aarch64-dump_syms:
         arguments: ['aarch64-apple-darwin']
     fetches:
         toolchain:
-            - linux64-rust-macos
+            - linux64-rust-macos-toolchain
             - linux64-clang-toolchain
             - macosx64-sdk-toolchain
 
@@ -58,5 +58,5 @@ win64-dump_syms:
     fetches:
         toolchain:
             - linux64-clang-toolchain
-            - linux64-rust-windows
+            - linux64-rust-windows-toolchain
             - vs-toolchain

toolkit/crashreporter/tools/symbolstore.py

@@ -23,7 +23,6 @@
 
 import ctypes
 import errno
-import io
 import os
 import platform
 import re
@@ -391,13 +390,13 @@ def validate_install_manifests(install_manifest_args):
 def make_file_mapping(install_manifests):
     file_mapping = {}
     for manifest, destination in install_manifests:
-        absolute_destination = os.path.abspath(destination)
+        destination = os.path.abspath(destination)
         reg = FileRegistry()
         manifest.populate_registry(reg)
         for dst, src in reg:
             if hasattr(src, "path"):
                 # Any paths that get compared to source file names need to go through realpath.
-                abs_dest = realpath(os.path.join(absolute_destination, dst))
+                abs_dest = realpath(os.path.join(destination, dst))
                 file_mapping[abs_dest] = realpath(src.path)
     return file_mapping
 
@@ -552,58 +551,7 @@ class Dumper:
         Get the commandline used to invoke dump_syms.
         """
         # The Mac dumper overrides this.
-        cmdline = [
-            self.dump_syms,
-            "--inlines",
-        ]
-
-        cmdline.extend(self.dump_syms_extra_info())
-        cmdline.append(file)
-
-        return cmdline
-
-    def dump_syms_extra_info(self):
-        """
-        Returns an array with the additional parameters to add information
-        about the build to the dump_syms command-line
-        """
-        cmdline = [
-            "--extra-info",
-            "RELEASECHANNEL " + buildconfig.substs["MOZ_UPDATE_CHANNEL"],
-            "--extra-info",
-            "VERSION " + buildconfig.substs["MOZ_APP_VERSION"],
-        ]
-
-        if buildconfig.substs.get("MOZ_APP_VENDOR") is not None:
-            cmdline.extend(
-                [
-                    "--extra-info",
-                    "VENDOR " + buildconfig.substs["MOZ_APP_VENDOR"],
-                ]
-            )
-
-        if buildconfig.substs.get("MOZ_APP_BASENAME") is not None:
-            cmdline.extend(
-                [
-                    "--extra-info",
-                    "PRODUCTNAME " + buildconfig.substs["MOZ_APP_BASENAME"],
-                ]
-            )
-
-        # Add the build ID if it's present
-        path = os.path.join(buildconfig.topobjdir, "buildid.h")
-        try:
-            buildid = io.open(path, "r", encoding="utf-8").read().split()[2]
-            cmdline.extend(
-                [
-                    "--extra-info",
-                    "BUILDID " + buildid,
-                ]
-            )
-        except Exception:
-            pass
-
-        return cmdline
+        return [self.dump_syms, "--inlines", file]
 
     def ProcessFileWork(
         self, file, arch_num, arch, vcs_root, dsymbundle=None, count_ctors=False
@@ -911,8 +859,9 @@ class Dumper_Linux(Dumper):
             full_path = os.path.normpath(os.path.join(self.symbol_path, rel_path))
             shutil.move(file_dbg, full_path)
             print(rel_path)
-        elif os.path.isfile(file_dbg):
-            os.unlink(file_dbg)
+        else:
+            if os.path.isfile(file_dbg):
+                os.unlink(file_dbg)
 
 
 class Dumper_Solaris(Dumper):
@@ -953,19 +902,11 @@ class Dumper_Mac(Dumper):
         # in order to dump all the symbols.
         if dsymbundle:
             # This is the .dSYM bundle.
-            cmdline = [
-                self.dump_syms,
-                arch.split(),
-                "--inlines",
-                "-j",
-                "2",
-            ]
-
-            cmdline.extend(self.dump_syms_extra_info())
-            cmdline.extend([dsymbundle, file])
-
-            return cmdline
-
+            return (
+                [self.dump_syms]
+                + arch.split()
+                + ["--inlines", "-j", "2", dsymbundle, file]
+            )
         return Dumper.dump_syms_cmdline(self, file, arch)
 
     def GenerateDSYM(self, file):
@@ -1125,13 +1066,13 @@ to canonical locations in the source repository. Specify
 
     if len(args) < 3:
         parser.error("not enough arguments")
-        sys.exit(1)
+        exit(1)
 
     try:
         manifests = validate_install_manifests(options.install_manifests)
     except (IOError, ValueError) as e:
         parser.error(str(e))
-        sys.exit(1)
+        exit(1)
     file_mapping = make_file_mapping(manifests)
     _, bucket = get_s3_region_and_bucket()
     dumper = GetPlatformSpecificDumper(