Bug 1291365 - Install Mercurial via install-mercurial.sh in ubuntu1204-test image; r?dustin draft
authorGregory Szorc <gps@mozilla.com>
Tue, 02 Aug 2016 12:44:31 -0700
changeset 398115 dda15c54a3f195ce2a7cc5fc9cef3ef97c2f2dec
parent 398114 9e1735ce4afb778a3a5cab237b0e672969e013b1
child 398116 5af7eb0002f03d4b683f459fd8e98e4447920533
push id25452
push userbmo:gps@mozilla.com
push dateMon, 08 Aug 2016 18:58:02 +0000
reviewersdustin
bugs1291365
milestone51.0a1
Bug 1291365 - Install Mercurial via install-mercurial.sh in ubuntu1204-test image; r?dustin This also bumps the Mercurial version from 3.7.3 to 3.8.4. MozReview-Commit-ID: 2qfDLTFqlaj
testing/docker/ubuntu1204-test/Dockerfile
testing/docker/ubuntu1204-test/system-setup.sh
--- a/testing/docker/ubuntu1204-test/Dockerfile
+++ b/testing/docker/ubuntu1204-test/Dockerfile
@@ -2,16 +2,19 @@ FROM          ubuntu:12.04
 MAINTAINER    Jonas Finnemann Jensen <jopsen@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 /tmp/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/ubuntu1204-test/system-setup.sh
+++ b/testing/docker/ubuntu1204-test/system-setup.sh
@@ -125,16 +125,18 @@ apt-get install -y --force-yes ${apt_pac
 dpkg-reconfigure locales
 
 tooltool_fetch() {
     cat >manifest.tt
     python /setup/tooltool.py fetch
     rm manifest.tt
 }
 
+. /tmp/install-mercurial.sh
+
 # install peep
 tooltool_fetch <<'EOF'
 [
 {
     "size": 26912,
     "digest": "9d730ed7852d4d217aaddda959cd5f871ef1b26dd6c513a3780bbb04a5a93a49d6b78e95c2274451a1311c10cc0a72755b269dc9af62640474e6e73a1abec370",
     "algorithm": "sha512",
     "filename": "peep-2.4.1.tar.gz",
@@ -147,19 +149,16 @@ pip install peep-2.4.1.tar.gz
 # remaining Python utilities are installed with `peep` from upstream
 # repositories; peep verifies file integrity for us
 cat >requirements.txt <<'EOF'
 # wheel
 # sha256: 90pZQ6kAXB6Je8-H9-ivfgDAb6l3e5rWkfafn6VKh9g
 # tarball:
 # sha256: qryO8YzdvYoqnH-SvEPi_qVLEUczDWXbkg7zzpgS49w
 virtualenv==13.1.2
-
-# sha256: wJnELXTi1SC2HdNyzZlrD6dgXAZheDT9exPHm5qaWzA
-mercurial==3.7.3
 EOF
 peep install -r requirements.txt
 
 # Install node
 wget https://nodejs.org/dist/v5.0.0/node-v5.0.0-linux-x64.tar.gz
 echo 'ef73b59048a0ed11d01633f0061627b7a9879257deb9add2255e4d0808f8b671  node-v5.0.0-linux-x64.tar.gz' | sha256sum -c
 tar -C /usr/local -xz --strip-components 1 < node-v5.0.0-linux-x64.tar.gz
 node -v  # verify