Bug 1291365 - Use install-mercurial.sh in ubuntu1604-test; r=dustin
authorGregory Szorc <gps@mozilla.com>
Fri, 05 Aug 2016 09:23:31 -0700
changeset 308686 3cf365cf9b907f9fb9240fd4d1463ab104748ef3
parent 308685 5111fd8cb91d11f1dc174bd9bd2ea0da908d5f89
child 308687 fdc5c16b3f8ef190ea6b53e03c30f5a4a29c8e01
push id80407
push usercbook@mozilla.com
push dateTue, 09 Aug 2016 13:48:02 +0000
treeherdermozilla-inbound@99f20b0c58d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1291365
milestone51.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 1291365 - Use install-mercurial.sh in ubuntu1604-test; r=dustin MozReview-Commit-ID: EiNT8Lmr8O6
testing/docker/ubuntu1604-test/Dockerfile
testing/docker/ubuntu1604-test/system-setup.sh
--- a/testing/docker/ubuntu1604-test/Dockerfile
+++ b/testing/docker/ubuntu1604-test/Dockerfile
@@ -2,16 +2,19 @@ FROM          ubuntu:16.04
 MAINTAINER    Joel Maher <joel.maher@gmail.com>
 
 RUN useradd -d /home/worker -s /bin/bash -m worker
 WORKDIR /home/worker
 
 # %include testing/docker/recipes/tooltool.py
 ADD topsrcdir/testing/docker/recipes/tooltool.py /setup/tooltool.py
 
+# %include testing/docker/recipes/install-mercurial.sh
+ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /setup/install-mercurial.sh
+
 # install non-build specific dependencies in a single layer
 ADD           system-setup.sh   /tmp/system-setup.sh
 RUN           bash /tmp/system-setup.sh
 
 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
 ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
--- a/testing/docker/ubuntu1604-test/system-setup.sh
+++ b/testing/docker/ubuntu1604-test/system-setup.sh
@@ -92,20 +92,21 @@ dpkg-reconfigure locales
 
 # set up tooltool (temporarily)
 tooltool_fetch() {
     cat >manifest.tt
     python /setup/tooltool.py fetch
     rm manifest.tt
 }
 
+. /setup/install-mercurial.sh
+
 pip install --upgrade pip
 
 pip install virtualenv
-pip install mercurial
 
 # Install node
 tooltool_fetch <<'EOF'
 [
 {
     "size": 5676610,
     "digest": "ce27b788dfd141a5ba7674332825fc136fe2c4f49a319dd19b3a87c8fffa7a97d86cbb8535661c9a68c9122719aa969fc6a8c886458a0df9fc822eec99ed130b",
     "algorithm": "sha512",