Bug 1289249 - Add run-task to desktop-build image; r?dustin draft
authorGregory Szorc <gps@mozilla.com>
Wed, 28 Sep 2016 20:12:08 -0700
changeset 419538 9e7b39eafa332398f9d56e89ba0036240b460b09
parent 419537 072dcd21925818bf9d62532c48637e990c8bc580
child 419539 dbc65d62bdf738a3526b1460942b1aae9ba32665
push id30957
push userbmo:gps@mozilla.com
push dateFri, 30 Sep 2016 16:24:29 +0000
reviewersdustin
bugs1289249
milestone52.0a1
Bug 1289249 - Add run-task to desktop-build image; r?dustin run-task is our new universal wrapper for executing tasks. Add it to desktop-build. MozReview-Commit-ID: BCYHVRdUopQ
testing/docker/desktop-build/Dockerfile
--- a/testing/docker/desktop-build/Dockerfile
+++ b/testing/docker/desktop-build/Dockerfile
@@ -32,16 +32,19 @@ ADD topsrcdir/testing/docker/recipes/cen
 RUN pip uninstall -y Mercurial
 
 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
 
+# %include testing/docker/recipes/run-task
+ADD topsrcdir/testing/docker/recipes/run-task /home/worker/bin/run-task
+
 # Add configuration
 COPY            dot-config                    /home/worker/.config
 
 # Generate machine uuid file
 RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
 
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to