Bug 1247168 - Change decision image to Ubuntu 16.04; r=dustin
authorGregory Szorc <gps@mozilla.com>
Wed, 20 Jul 2016 09:21:38 -0700
changeset 331567 eb08ab6d23493e62fecaa2b2d7ec44119a34ff6c
parent 331566 fcc1771bbe23fc14cc667afff689546dfc166a94
child 331568 418fc99dfe92205e006f11bc2ae4d1cf83d329d0
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1247168
milestone50.0a1
Bug 1247168 - Change decision image to Ubuntu 16.04; r=dustin We're currently running Ubuntu 14.04 in the decision image. While it is still in LTS support, 16.04 ships with a modern, properly configured Python 2.7. So we upgrade to 16.04 and drop the install of Python from source because it is no longer needed. This is part 1 of a larger refactor to this image. MozReview-Commit-ID: CTbsPmTjcgs
testing/docker/decision/Dockerfile
testing/docker/decision/system-setup.sh
--- a/testing/docker/decision/Dockerfile
+++ b/testing/docker/decision/Dockerfile
@@ -1,20 +1,20 @@
-FROM          ubuntu:14.04
+FROM          ubuntu:16.04
 MAINTAINER    Greg Arndt <garndt@mozilla.com>
 
 # Add worker user
 RUN useradd -d /home/worker -s /bin/bash -m worker
 RUN mkdir /home/worker/artifacts && chown worker:worker /home/worker/artifacts
 
 # install non-build specific dependencies in a single layer
 ADD system-setup.sh   /tmp/system-setup.sh
 RUN bash /tmp/system-setup.sh
 
 ADD bin /home/worker/bin
 RUN chmod +x /home/worker/bin/*
 
-ENV PATH /home/worker/bin:/usr/local/lib/python2.7.10/bin:$PATH
+ENV PATH /home/worker/bin:$PATH
 ENV SHELL /bin/bash
 ENV HOME /home/worker
 
 # Set a default command useful for debugging
 CMD ["/bin/bash", "--login"]
--- a/testing/docker/decision/system-setup.sh
+++ b/testing/docker/decision/system-setup.sh
@@ -27,16 +27,17 @@ apt-get install -y --force-yes --no-inst
     libreadline-dev \
     libsqlite3-dev \
     libssl-dev \
     libtinfo-dev \
     make \
     mime-support \
     netbase \
     net-tools \
+    python2.7 \
     python-dev \
     python-pip \
     python-crypto \
     python-mox3 \
     python-pil \
     python-ply \
     quilt \
     tar \
@@ -50,37 +51,16 @@ mkdir $BUILD
 tooltool_fetch() {
     cat >manifest.tt
     python $BUILD/tooltool.py fetch
     rm manifest.tt
 }
 
 curl https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py > ${BUILD}/tooltool.py
 
-cd $BUILD
-tooltool_fetch <<'EOF'
-[
-{
-    "size": 12250696,
-    "digest": "67615a6defbcda062f15a09f9dd3b9441afd01a8cc3255e5bc45b925378a0ddc38d468b7701176f6cc153ec52a4f21671b433780d9bde343aa9b9c1b2ae29feb",
-    "algorithm": "sha512",
-    "filename": "Python-2.7.10.tar.xz",
-    "unpack": true
-}
-]
-EOF
-
-cd Python-2.7.10
-./configure --prefix /usr/local/lib/python2.7.10
-make -j$(nproc)
-make install
-
-PATH=/usr/local/lib/python2.7.10/bin/:$PATH
-python --version
-
 # Enough python utilities to get "peep" working
 cd $BUILD
 tooltool_fetch <<'EOF'
 [
 {
     "size": 630700,
     "digest": "1367f3a10c1fef2f8061e430585f1927f6bd7c416e764d65cea1f4255824d549efa77beef8ff784bbd62c307b4b1123502e7b3fd01a243c0cc5b433a841cc8b5",
     "algorithm": "sha512",