Bug 1513157 - Don't install minidump_stackwalk in the Ubuntu test image. r=gps,ted
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 11 Dec 2018 22:52:12 +0000
changeset 507258 84433828d732d0806310ec43e49ebc1cead61402
parent 507257 63525718264d799c4076a22c9ab8e0e6922bd2c5
child 507259 641cfb982930380a568ea2c6439d418de8cc198a
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, ted
bugs1513157
milestone66.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
Bug 1513157 - Don't install minidump_stackwalk in the Ubuntu test image. r=gps,ted Differential Revision: https://phabricator.services.mozilla.com/D14133
taskcluster/docker/desktop1604-test/Dockerfile
taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
testing/mozharness/configs/android/android_common.py
testing/mozharness/configs/remove_executables.py
testing/mozharness/configs/web_platform_tests/prod_config_android.py
--- a/taskcluster/docker/desktop1604-test/Dockerfile
+++ b/taskcluster/docker/desktop1604-test/Dockerfile
@@ -30,20 +30,16 @@ COPY topsrcdir/taskcluster/docker/recipe
 ADD topsrcdir/taskcluster/docker/recipes/common.sh /setup/common.sh
 
 # %include taskcluster/docker/recipes/install-mercurial.sh
 ADD topsrcdir/taskcluster/docker/recipes/install-mercurial.sh /setup/install-mercurial.sh
 
 # %include taskcluster/docker/recipes/install-node.sh
 ADD topsrcdir/taskcluster/docker/recipes/install-node.sh /setup/install-node.sh
 
-# Add the tooltool manifest containing the minidump_stackwalk binary.
-# %include testing/config/tooltool-manifests/linux64/releng.manifest
-ADD topsrcdir/testing/config/tooltool-manifests/linux64/releng.manifest /tmp/minidump_stackwalk.manifest
-
 # %include taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
 ADD topsrcdir/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh /setup/system-setup.sh
 RUN           bash /setup/system-setup.sh
 
 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
 ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
 
--- a/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
+++ b/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
@@ -126,21 +126,18 @@ EOF
 cp valgrind-15775-3206-ubuntu1204.tgz /tmp
 (cd / && tar xzf /tmp/valgrind-15775-3206-ubuntu1204.tgz)
 rm /tmp/valgrind-15775-3206-ubuntu1204.tgz
 cp /usr/local/bin/valgrind /usr/bin/valgrind
 apt-get install -y libc6-dbg
 valgrind --version
 valgrind date
 
-# Fetch the minidump_stackwalk binary specified by the in-tree tooltool manifest.
-python /setup/tooltool.py fetch -m /tmp/minidump_stackwalk.manifest
-rm /tmp/minidump_stackwalk.manifest
-mv linux64-minidump_stackwalk /usr/local/bin/
-chmod +x /usr/local/bin/linux64-minidump_stackwalk
+# Until bug 1511527 is fixed, remove the file from the image to ensure it's not there.
+rm -f /usr/local/bin/linux64-minidump_stackwalk
 
 # adding multiverse to get 'ubuntu-restricted-extras' below
 apt-add-repository multiverse
 apt-get update
 
 # for mp4 codec (used in MSE tests)
 apt-get -q -y -f install ubuntu-restricted-extras
 # TEMPORARY: we do not want flash installed, but the above pulls it in (bug 1349208)
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -44,17 +44,17 @@ config = {
     ],
     "tooltool_cache": os.environ.get("TOOLTOOL_CACHE"),
     "tooltool_servers": ['http://relengapi/tooltool/'],
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
     "avds_dir": "/builds/worker/workspace/build/.android",
     # "log_format": "%(levelname)8s - %(message)s",
     "log_tbpl_level": "info",
     "log_raw_level": "info",
-    "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
+    "minidump_stackwalk_path": "linux64-minidump_stackwalk",
     "marionette_address": "localhost:2828",
     "marionette_test_manifest": "unit-tests.ini",
     # 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:
     # "screenshot_times": [60, 120, 180, 240],
 
     "suite_definitions": {
--- a/testing/mozharness/configs/remove_executables.py
+++ b/testing/mozharness/configs/remove_executables.py
@@ -1,8 +1,6 @@
 config = {
     # We bake this directly into the tester image now...
-    "download_minidump_stackwalk": False,
-    "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
     "download_nodejs": False,
     "nodejs_path": "/usr/local/bin/node",
     "exes": {}
 }
--- a/testing/mozharness/configs/web_platform_tests/prod_config_android.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_android.py
@@ -13,18 +13,18 @@ config = {
         "--ca-cert-path=%(test_path)s/tests/tools/certs/cacert.pem",
         "--host-key-path=%(test_path)s/tests/tools/certs/web-platform.test.key",
         "--host-cert-path=%(test_path)s/tests/tools/certs/web-platform.test.pem",
         "--certutil-binary=%(xre_path)s/certutil",
         "--product=fennec",
     ],
     "avds_dir": "/builds/worker/workspace/build/.android",
     "binary_path": "/tmp",
-    "download_minidump_stackwalk": False,
+    "download_minidump_stackwalk": True,
     "geckodriver": "%(abs_test_bin_dir)s/geckodriver",
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
     "log_tbpl_level": "info",
     "log_raw_level": "info",
-    "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
+    "minidump_stackwalk_path": "linux64-minidump_stackwalk",
     "per_test_category": "web-platform",
     "tooltool_cache": os.environ.get("TOOLTOOL_CACHE"),
     "tooltool_servers": ['http://relengapi/tooltool/'],
 }