Bug 1257127 - Change b2g Docker images and scripts to upgrade host toolchain r=garndt
authorJuan Gomez <jgomez@mozilla.com>
Mon, 21 Mar 2016 15:50:27 -0700
changeset 289718 fcb7f6fbe3baaedb90ab645beb48d43c20adfd37
parent 289717 3a2973be8bbdd9d15fc9f932a942fe9c4c724d5e
child 289719 136f541c44069cd114ca981ee76f0d3b9ed0b870
push id30108
push usercbook@mozilla.com
push dateTue, 22 Mar 2016 11:14:31 +0000
treeherdermozilla-central@ea6298e1b4f7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgarndt
bugs1257127
milestone48.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 1257127 - Change b2g Docker images and scripts to upgrade host toolchain r=garndt MozReview-Commit-ID: 4uu6D5S73X1
testing/docker/b2g-build/Dockerfile
testing/docker/b2g-build/VERSION
testing/docker/builder/Dockerfile
testing/taskcluster/scripts/builder/install-packages.sh
--- a/testing/docker/b2g-build/Dockerfile
+++ b/testing/docker/b2g-build/Dockerfile
@@ -90,23 +90,25 @@ RUN yum install -y \
   zlib-devel.i686 && \
   # Remove cached packages. Cached package takes up a lot of space and
   # distributing them to workers is wasteful.
   yum clean all
 
 RUN mkdir -p /home/worker/bin
 COPY bin/repository-url.py /home/worker/bin/repository-url.py
 
+ENV GCC_PATH /home/worker/workspace/gecko/gcc
+
 # Default to mozilla specific python, etc...
 ENV PATH /tools/python27-mercurial/bin:/tools/python27/bin:$PATH
 ENV PATH /tools/tools/buildfarm/utils:$PATH:/home/worker/bin/
-ENV PATH /tools/gcc-4.7.3-0moz1/bin:$PATH
+ENV PATH $GCC_PATH/bin:/tools/gcc-4.7.3-0moz1/bin:$PATH
 
 # Use the libstd++ we installed over all others...
-env LD_LIBRARY_PATH=/tools/gcc-4.7.3-0moz1/lib64:/tools/gcc-4.7.3-0moz1/lib
+env LD_LIBRARY_PATH=$GCC_PATH/lib64:$GCC_PATH/lib:/tools/gcc-4.7.3-0moz1/lib64:/tools/gcc-4.7.3-0moz1/lib
 
 RUN useradd -d /home/worker -s /bin/bash -m worker
 
 # Terrible symlink hacks so cc points to the gcc version we intend to use...
 RUN ls -lah /tools/gcc-4.7.3-0moz1/bin && ln -s /tools/gcc-4.7.3-0moz1/bin/gcc /tools/gcc-4.7.3-0moz1/bin/cc
 
 # Terrible Hack to correctly install git-2.4.1
 RUN mkdir -p /tmp/git && cd /tmp/git && \
@@ -121,17 +123,17 @@ ENV NODE_VERSION v0.10.36
 RUN cd /usr/local/ && \
     curl https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.gz | tar -xz --strip-components 1 && \
     node -v
 
 RUN wget --no-check-certificate https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz && \
     tar -xvf setuptools-1.4.2.tar.gz && \
     cd setuptools-1.4.2 && python setup.py install && \
     cd - && rm -rf setuptools-1.4.2* && \
-    curl https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py | python - && \
+    curl https://bootstrap.pypa.io/get-pip.py | python - && \
     pip install virtualenv
 
 # Generate machine uuid file
 RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
 
 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
 ENV           HOME          /home/worker
--- a/testing/docker/b2g-build/VERSION
+++ b/testing/docker/b2g-build/VERSION
@@ -1,1 +1,1 @@
-0.2.9
+0.2.10
--- a/testing/docker/builder/Dockerfile
+++ b/testing/docker/builder/Dockerfile
@@ -1,9 +1,9 @@
-FROM          quay.io/mozilla/b2g-build:0.2.9
+FROM          quay.io/mozilla/b2g-build:0.2.10
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ENV VERSION 1.2
 ENV PYTHONPATH /tools/tools/lib/python:$PYTHONPATH
 ENV TOOLTOOL_CACHE  /home/worker/tools/tooltool-cache
 
 ADD https://raw.githubusercontent.com/taskcluster/buildbot-step/19219c470bd95b390ed0b31d4bf455169bf12fca/buildbot_step.js /home/worker/bin/buildbot_step
 
--- a/testing/taskcluster/scripts/builder/install-packages.sh
+++ b/testing/taskcluster/scripts/builder/install-packages.sh
@@ -5,8 +5,11 @@ test -d $gecko_dir
 test -n "$TOOLTOOL_CACHE"
 test -n "$TOOLTOOL_MANIFEST"
 test -n "$TOOLTOOL_REPO"
 test -n "$TOOLTOOL_REV"
 
 tc-vcs checkout $gecko_dir/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
 
 (cd $gecko_dir; python $gecko_dir/tooltool/tooltool.py --url https://api.pub.build.mozilla.org/tooltool/ -m $gecko_dir/$TOOLTOOL_MANIFEST fetch -c $TOOLTOOL_CACHE)
+
+# Another terrible hack..
+(ls $gecko_dir/gcc/bin/gcc && ln -s $gecko_dir/gcc/bin/gcc $gecko_dir/gcc/bin/cc)