Backed out changeset 22eee779473b (bug 1306662) for image generation failures
authorGregory Szorc <gps@mozilla.com>
Fri, 30 Sep 2016 10:41:48 -0700
changeset 316016 5306b93f91b7df12314d990deed0e034fedab7e2
parent 316015 22eee779473b155f28aab3fd9a5248d1d0646a56
child 316017 11cf2ce8a9bd760427a0be1ce09b0ac78fdaf32d
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)
bugs1306662
milestone52.0a1
backs out22eee779473b155f28aab3fd9a5248d1d0646a56
Backed out changeset 22eee779473b (bug 1306662) for image generation failures
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,20 +12,16 @@ 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
@@ -55,16 +51,20 @@ 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,20 +11,16 @@ 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,22 +222,16 @@ 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,22 +138,16 @@ 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 \