Backed out 3 changesets (bug 1525218) for breaking fenix, reference-b…

…rowser speedometer tasks. a=backout Backed out changeset 76036ce90611 (bug 1525218) Backed out changeset 9c66ecb1f66c (bug 1525218) Backed out changeset eb4b265deb5e (bug 1525218)
mozilla-spidermonkey · Jan 20, 2020 · aef3f9a · aef3f9a
1 parent bca69d3
commit aef3f9a
Show file tree

Hide file tree

Showing 32 changed files with 196 additions and 43 deletions.
diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/config/tooltool-manifests/win32/releng.manifest
@@ -21,5 +21,12 @@
     "unpack": true,
     "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
     "size": 297118
+  },
+  {
+    "size": 1701376,
+    "visibility": "public",
+    "digest": "2bc729f9cedfba59b5c7a088f00d00fc078af3bd08e88ee41bbb1ea092038466f46589cef036e0d928249f6037fb22828f62e6d82a32d018f66ca92a834393c8",
+    "algorithm": "sha512",
+    "filename": "win32-minidump_stackwalk.exe"
   }
 ]
diff --git a/browser/config/tooltool-manifests/win64/aarch64.manifest b/browser/config/tooltool-manifests/win64/aarch64.manifest
@@ -22,5 +22,12 @@
     "unpack": true,
     "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
     "size": 297118
+  },
+  {
+    "size": 1701376,
+    "visibility": "public",
+    "digest": "2bc729f9cedfba59b5c7a088f00d00fc078af3bd08e88ee41bbb1ea092038466f46589cef036e0d928249f6037fb22828f62e6d82a32d018f66ca92a834393c8",
+    "algorithm": "sha512",
+    "filename": "win32-minidump_stackwalk.exe"
   }
 ]
diff --git a/browser/config/tooltool-manifests/win64/releng.manifest b/browser/config/tooltool-manifests/win64/releng.manifest
@@ -21,5 +21,12 @@
     "unpack": true,
     "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
     "size": 297118
+  },
+  {
+    "size": 1701376,
+    "visibility": "public",
+    "digest": "2bc729f9cedfba59b5c7a088f00d00fc078af3bd08e88ee41bbb1ea092038466f46589cef036e0d928249f6037fb22828f62e6d82a32d018f66ca92a834393c8",
+    "algorithm": "sha512",
+    "filename": "win32-minidump_stackwalk.exe"
   }
 ]
diff --git a/build/sparse-profiles/docker-image b/build/sparse-profiles/docker-image
@@ -9,6 +9,7 @@ path:browser/config/version.txt
 
 # Result from `grep -hr %include taskcluster/docker | grep -v " taskcluster/" | sort -u`
 path:python/mozbuild/mozbuild/action/tooltool.py
+path:testing/config/tooltool-manifests/linux64/releng.manifest
 path:testing/mozharness/external_tools/performance-artifact-schema.json
 path:testing/mozharness/external_tools/robustcheckout.py
 path:tools/lint/spell/codespell_requirements.txt

diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/ci/test/kind.yml
@@ -56,12 +56,3 @@ job-defaults:
                     .*-devedition/.*: false
                     default: true
             default: false
-    fetches:
-        toolchain:
-            by-test-platform:
-                win.*:
-                    - win32-minidump-stackwalk
-                macosx.*:
-                    - macosx64-minidump-stackwalk
-                default:
-                    - linux64-minidump-stackwalk
diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml
@@ -81,18 +81,13 @@ test-verify:
             by-test-platform:
                 linux.*:
                     - linux64-node
-                    - linux64-minidump-stackwalk
                 macosx.*:
                     - macosx64-node
-                    - macosx64-minidump-stackwalk
                 win.*64.*:
                     - win64-node
-                    - win32-minidump-stackwalk
                 win.*32.*:
                     - win32-node
-                    - win32-minidump-stackwalk
-                android-em-7.*:
-                    - linux64-minidump-stackwalk
+                android-em-7.*: []
 
 test-verify-gpu:
     description: "Extra verification of tests modified on this push on gpu instances"
@@ -173,21 +168,15 @@ test-coverage:
             by-test-platform:
                 linux.*:
                     - linux64-node
-                    - linux64-minidump-stackwalk
                 macosx.*:
                     - macosx64-node
-                    - macosx64-minidump-stackwalk
                 win.*aarch64.*:
                     - win32-node
-                    - win32-minidump-stackwalk
                 win.*-64.*:
                     - win64-node
-                    - win32-minidump-stackwalk
                 win.*32.*:
                     - win32-node
-                    - win32-minidump-stackwalk
-                android-em-7.*:
-                    - linux64-minidump-stackwalk
+                android-em-7.*: []
 
 test-coverage-gpu:
     description: "Per-test coverage for tests that require gpu instances"

diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
@@ -76,18 +76,12 @@ xpcshell:
             by-test-platform:
                 linux.*:
                     - linux64-node
-                    - linux64-minidump-stackwalk
                 macosx.*:
                     - macosx64-node
-                    - macosx64-minidump-stackwalk
                 win.*aarch64.*:
                     - win32-node
-                    - win32-minidump-stackwalk
                 win.*-64.*:
                     - win64-node
-                    - win32-minidump-stackwalk
                 win.*32.*:
                     - win32-node
-                    - win32-minidump-stackwalk
-                android-em-7.*:
-                    - linux64-minidump-stackwalk
+                android-em-7.*: []
diff --git a/testing/config/tooltool-manifests/linux32/releng.manifest b/testing/config/tooltool-manifests/linux32/releng.manifest
@@ -0,0 +1,9 @@
+[
+  {
+    "size": 866276,
+    "visibility": "public",
+    "digest": "a063a151555ef78f8d5795f558632dd7d3f511ad6276915f3c8cfec44146ba1e82c0a3db063a3e30921171563880d4d7794da1a036b00fab03d95988d491dc6b",
+    "algorithm": "sha512",
+    "filename": "linux32-minidump_stackwalk"
+  }
+]
diff --git a/testing/config/tooltool-manifests/linux64/releng.manifest b/testing/config/tooltool-manifests/linux64/releng.manifest
@@ -0,0 +1,9 @@
+[
+  {
+    "size": 6519680,
+    "visibility": "public",
+    "digest": "15f8ae94bd1ab6baa6a853c47fcc2f7ffb1fc1004f6316b81b9b1f22a705d017ef28b8a397575965223c7f4d68becad5ba981ae2647963588fc771accca61795",
+    "algorithm": "sha512",
+    "filename": "linux64-minidump_stackwalk"
+  }
+]
diff --git a/testing/config/tooltool-manifests/macosx64/releng.manifest b/testing/config/tooltool-manifests/macosx64/releng.manifest
@@ -0,0 +1,9 @@
+[
+  {
+    "size": 843008,
+    "visibility": "public",
+    "digest": "2105e384ffbf3459d91701207e879a676ab8e49ca1dc2b7bf1e7d695fb6245ba719285c9841429bbc6605ae4e710107621f788a7204ed681148115ccf64ac087",
+    "algorithm": "sha512",
+    "filename": "macosx64-minidump_stackwalk"
+  }
+]
diff --git a/testing/config/tooltool-manifests/win32/releng.manifest b/testing/config/tooltool-manifests/win32/releng.manifest
@@ -0,0 +1,9 @@
+[
+  {
+    "size": 1701376,
+    "visibility": "public",
+    "digest": "2bc729f9cedfba59b5c7a088f00d00fc078af3bd08e88ee41bbb1ea092038466f46589cef036e0d928249f6037fb22828f62e6d82a32d018f66ca92a834393c8",
+    "algorithm": "sha512",
+    "filename": "win32-minidump_stackwalk.exe"
+  }
+]
diff --git a/testing/mozharness/configs/android/android_common.py b/testing/mozharness/configs/android/android_common.py
@@ -48,6 +48,7 @@ def WebglSuite(name):
     # "log_format": "%(levelname)8s - %(message)s",
     "log_tbpl_level": "info",
     "log_raw_level": "info",
+    "minidump_stackwalk_path": "linux64-minidump_stackwalk",
     # To take device screenshots at timed intervals (each time in seconds, relative
     # to the start of the run-tests step) specify screenshot_times. For example, to
     # take 4 screenshots at one minute intervals you could specify:

diff --git a/testing/mozharness/configs/android/android_hw.py b/testing/mozharness/configs/android/android_hw.py
@@ -21,5 +21,7 @@
     "tooltool_cache": "/builds/tooltool_cache",
     # from android_common.py
     "download_tooltool": True,
+    "minidump_stackwalk_path": "linux64-minidump_stackwalk",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/linux64/releng.manifest",
     "xpcshell_extra": "--remoteTestRoot=/data/local/tests",
 }
diff --git a/testing/mozharness/configs/awsy/linux_config.py b/testing/mozharness/configs/awsy/linux_config.py
@@ -1,7 +1,14 @@
 import os
+import platform
 
 PYTHON = "/usr/bin/env python"
 VENV_PATH = '%s/build/venv' % os.getcwd()
+if platform.architecture()[0] == '64bit':
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
+else:
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
 BINARY_PATH = os.path.join(ABS_WORK_DIR, "application", "firefox", "firefox-bin")
 INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
@@ -23,5 +30,7 @@
         "install",
         "run-tests",
     ],
+    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
+    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": os.path.join(os.getcwd(), "tooltool_cache"),
 }
diff --git a/testing/mozharness/configs/awsy/macosx_config.py b/testing/mozharness/configs/awsy/macosx_config.py
@@ -2,6 +2,8 @@
 
 PYTHON = "/usr/bin/env python"
 VENV_PATH = '%s/build/venv' % os.getcwd()
+TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/macosx64/releng.manifest"
+MINIDUMP_STACKWALK_PATH = "macosx64-minidump_stackwalk"
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
 INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.dmg")
 
@@ -21,5 +23,7 @@
         "install",
         "run-tests",
     ],
+    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
+    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": os.path.join(os.getcwd(), "tooltool_cache"),
 }
diff --git a/testing/mozharness/configs/raptor/android_hw_config.py b/testing/mozharness/configs/raptor/android_hw_config.py
@@ -14,6 +14,8 @@
     ],
     "tooltool_cache": "/builds/tooltool_cache",
     "download_tooltool": True,
+    "minidump_stackwalk_path": "linux64-minidump_stackwalk",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/linux64/releng.manifest",
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
 }
 

diff --git a/testing/mozharness/configs/raptor/linux64_config_taskcluster.py b/testing/mozharness/configs/raptor/linux64_config_taskcluster.py
@@ -4,6 +4,9 @@
 PYTHON = sys.executable
 VENV_PATH = '%s/build/venv' % os.getcwd()
 
+TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
+MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
+
 exes = {
     'python': PYTHON,
 }
@@ -24,5 +27,7 @@
         "install",
         "run-tests",
     ],
+    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
+    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": "/builds/worker/tooltool-cache",
 }
diff --git a/testing/mozharness/configs/raptor/linux_config.py b/testing/mozharness/configs/raptor/linux_config.py
@@ -1,6 +1,13 @@
 import os
+import platform
 
 VENV_PATH = '%s/build/venv' % os.getcwd()
+if platform.architecture()[0] == '64bit':
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
+else:
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
 
 config = {
     "log_name": "raptor",
@@ -16,5 +23,7 @@
         "install",
         "run-tests",
     ],
+    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
+    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": "/builds/tooltool_cache",
 }
diff --git a/testing/mozharness/configs/raptor/mac_config.py b/testing/mozharness/configs/raptor/mac_config.py
@@ -19,5 +19,7 @@
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [],
     "postflight_run_cmd_suites": [],
+    "minidump_stackwalk_path": "macosx64-minidump_stackwalk",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/macosx64/releng.manifest",
     "tooltool_cache": "/builds/tooltool_cache",
 }
diff --git a/testing/mozharness/configs/raptor/windows_config.py b/testing/mozharness/configs/raptor/windows_config.py
@@ -31,6 +31,8 @@
         "run-tests",
     ],
     "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
+    "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
     "python3_manifest": {
         "win32": "python3.manifest",
         "win64": "python3_x64.manifest",

diff --git a/testing/mozharness/configs/raptor/windows_vm_config.py b/testing/mozharness/configs/raptor/windows_vm_config.py
@@ -30,6 +30,8 @@
         "run-tests",
     ],
     "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
+    "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
     "python3_manifest": {
         "win32": "python3.manifest",
         "win64": "python3_x64.manifest",

diff --git a/testing/mozharness/configs/talos/linux64_config_taskcluster.py b/testing/mozharness/configs/talos/linux64_config_taskcluster.py
@@ -1,9 +1,17 @@
 import os
+import platform
 import sys
 
 PYTHON = sys.executable
 VENV_PATH = '%s/build/venv' % os.getcwd()
 
+if platform.architecture()[0] == '64bit':
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
+else:
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
+
 exes = {
     'python': PYTHON,
 }
@@ -24,5 +32,7 @@
         "install",
         "run-tests",
     ],
+    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
+    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": "/builds/worker/tooltool-cache",
 }
diff --git a/testing/mozharness/configs/talos/linux_config.py b/testing/mozharness/configs/talos/linux_config.py
@@ -1,6 +1,13 @@
 import os
+import platform
 
 VENV_PATH = '%s/build/venv' % os.getcwd()
+if platform.architecture()[0] == '64bit':
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
+else:
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
 
 config = {
     "log_name": "talos",
@@ -15,5 +22,7 @@
         "install",
         "run-tests",
     ],
+    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
+    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": "/builds/tooltool_cache",
 }
diff --git a/testing/mozharness/configs/talos/mac_config.py b/testing/mozharness/configs/talos/mac_config.py
@@ -18,5 +18,7 @@
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [],
     "postflight_run_cmd_suites": [],
+    "minidump_stackwalk_path": "macosx64-minidump_stackwalk",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/macosx64/releng.manifest",
     "tooltool_cache": "/builds/tooltool_cache",
 }
diff --git a/testing/mozharness/configs/talos/windows_config.py b/testing/mozharness/configs/talos/windows_config.py
@@ -25,4 +25,6 @@
         "run-tests",
     ],
     "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
+    "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest"
 }
diff --git a/testing/mozharness/configs/talos/windows_taskcluster_config.py b/testing/mozharness/configs/talos/windows_taskcluster_config.py
@@ -22,4 +22,6 @@
         "run-tests",
     ],
     "tooltool_cache": os.path.join('Y:\\', 'tooltool-cache'),
+    "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest"
 }
diff --git a/testing/mozharness/configs/talos/windows_vm_config.py b/testing/mozharness/configs/talos/windows_vm_config.py
@@ -24,4 +24,6 @@
         "run-tests",
     ],
     "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
+    "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
+    "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest"
 }
diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -22,9 +22,13 @@
 VALGRIND_SUPP_ARCH = None
 
 if platform.architecture()[0] == "64bit":
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
     VALGRIND_SUPP_ARCH = os.path.join(VALGRIND_SUPP_DIR,
                                       "x86_64-pc-linux-gnu.sup")
 else:
+    TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
+    MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
     VALGRIND_SUPP_ARCH = os.path.join(VALGRIND_SUPP_DIR,
                                       "i386-pc-linux-gnu.sup")
     NODEJS_TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/nodejs.manifest"
@@ -242,6 +246,8 @@
                              "cppunittest": [],
                              "jittest": [],
                              },
+    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
+    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
     "tooltool_cache": "/builds/worker/tooltool-cache",
     "nodejs_path": NODEJS_PATH,
     # "log_format": "%(levelname)8s - %(message)s",