bug 1306662 - Make desktop-test and desktop1604-test pull minidump_stackwalk binary from the in-tree tooltool manifest. r=gps
☠☠ backed out by 5306b93f91b7 ☠ ☠
authorTed Mielczarek <ted@mielczarek.org>
Fri, 30 Sep 2016 13:17:20 -0400
changeset 316015 22eee779473b155f28aab3fd9a5248d1d0646a56
parent 316014 b828802f32e5d540773329ad6a4945d98d53b72d
child 316016 5306b93f91b7df12314d990deed0e034fedab7e2
push id20637
push userphilringnalda@gmail.com
push dateSat, 01 Oct 2016 06:28:47 +0000
treeherderfx-team@87cd291d2db6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1306662
milestone52.0a1
bug 1306662 - Make desktop-test and desktop1604-test pull minidump_stackwalk binary from the in-tree tooltool manifest. r=gps Instead of having the desktop[1604]-test images currently bake in a minidump_stackwalk binary from some random S3 URL, use the binary listed in the in-tree tooltool manifest that we use for buildbot test jobs. As a nice side-effect, this will ensure that the desktop-test images get rebuilt whenever that manifest is updated with a new version, so they will continue to use the right version in the future. MozReview-Commit-ID: 6bThddwq6p1
testing/docker/desktop-test/Dockerfile
testing/docker/desktop1604-test/Dockerfile
testing/docker/recipes/ubuntu1204-test-system-setup.sh
testing/docker/recipes/ubuntu1604-test-system-setup.sh
--- a/testing/docker/desktop-test/Dockerfile
+++ b/testing/docker/desktop-test/Dockerfile
@@ -12,16 +12,20 @@ ADD topsrcdir/testing/mozharness/externa
 
 # %include testing/docker/recipes/install-mercurial.sh
 ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /tmp/install-mercurial.sh
 
 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include testing/docker/recipes/xvfb.sh
 ADD topsrcdir/testing/docker/recipes/xvfb.sh /home/worker/scripts/xvfb.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 testing/docker/recipes/ubuntu1204-test-system-setup.sh
 ADD topsrcdir/testing/docker/recipes/ubuntu1204-test-system-setup.sh /setup/system-setup.sh
 RUN bash /setup/system-setup.sh
 
 # %include testing/docker/recipes/run-task
 ADD topsrcdir/testing/docker/recipes/run-task /home/worker/bin/run-task
 
 # %include taskcluster/scripts/tester/test-ubuntu.sh
@@ -51,20 +55,16 @@ RUN            chmod +x bin/*
 # TODO: remove this when buildbot is gone
 COPY           buildprops.json               /home/worker/buildprops.json
 COPY           tc-vcs-config.yml /etc/taskcluster-vcs.yml
 
 # TODO: remove
 ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
 RUN chmod u+x /home/worker/bin/buildbot_step
 
-# TODO: remove
-ADD            https://s3-us-west-2.amazonaws.com/test-caching/packages/linux64-stackwalk /usr/local/bin/linux64-minidump_stackwalk
-RUN chmod +x /usr/local/bin/linux64-minidump_stackwalk
-
 # allow the worker user to access video devices
 RUN usermod -a -G video worker
 
 RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
 
 # install tc-vcs and tc-npm-cache
 RUN npm install -g taskcluster-vcs@2.3.12 \
  && npm install -g taskcluster-npm-cache@1.1.14 \
--- a/testing/docker/desktop1604-test/Dockerfile
+++ b/testing/docker/desktop1604-test/Dockerfile
@@ -11,16 +11,20 @@ ADD topsrcdir/testing/docker/recipes/too
 ADD topsrcdir/testing/mozharness/external_tools/robustcheckout.py /usr/local/mercurial/robustcheckout.py
 
 # %include testing/docker/recipes/common.sh
 ADD topsrcdir/testing/docker/recipes/common.sh /setup/common.sh
 
 # %include testing/docker/recipes/install-mercurial.sh
 ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /setup/install-mercurial.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 testing/docker/recipes/ubuntu1604-test-system-setup.sh
 ADD topsrcdir/testing/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 testing/docker/recipes/xvfb.sh
 ADD topsrcdir/testing/docker/recipes/xvfb.sh /home/worker/scripts/xvfb.sh
 
--- a/testing/docker/recipes/ubuntu1204-test-system-setup.sh
+++ b/testing/docker/recipes/ubuntu1204-test-system-setup.sh
@@ -222,16 +222,22 @@ 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 minidump_stackwalk.manifest
+rm minidump_stackwalk.manifest
+mv linux64-minidump_stackwalk /usr/local/bin/
+chmod +x /usr/local/bin/linux64-minidump_stackwalk
+
 apt-get update
 
 apt-get -q -y --force-yes install \
     libxcb1 \
     libxcb-render0 \
     libxcb-shm0 \
     libxcb-glx0 \
     libxcb-shape0 libxcb-glx0:i386
--- a/testing/docker/recipes/ubuntu1604-test-system-setup.sh
+++ b/testing/docker/recipes/ubuntu1604-test-system-setup.sh
@@ -138,16 +138,22 @@ 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 minidump_stackwalk.manifest
+rm minidump_stackwalk.manifest
+mv linux64-minidump_stackwalk /usr/local/bin/
+chmod +x /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
 
 apt-get -q -y -f install \