Bug 1227637 - Revert mesa upgrade for desktop-test jobs (TaskCluster Linux64 debug tier2 jobs). r=dustin

On the Buildbot side (bug 1220658) we upgraded to mesa-lts-saucy-9.2.1 and that caused a lot of
test failures accross the board.

In this change we're reverting upgrading to that version and going back to where we were.

--HG--
extra : commitid : KOsFpMsYfLJ
extra : rebase_source : 20c6c7f7eb1f14d256be597c25e8ac3431e7ecfb

testing/docker/desktop-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test-upd:0.1.5.20151222110000
+FROM          taskcluster/ubuntu1204-test-upd:0.1.6.20160105110000
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
 # Add utilities and configuration

testing/docker/desktop-test/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

testing/docker/ubuntu1204-test-upd/Dockerfile

@@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test:0.1.5
+FROM          taskcluster/ubuntu1204-test:0.1.6
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ### update to latest from upstream repositories

testing/docker/ubuntu1204-test-upd/VERSION

@@ -1 +1 @@
-0.1.5.20151222110000
+0.1.6.20160105110000

testing/docker/ubuntu1204-test/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

testing/docker/ubuntu1204-test/system-setup.sh

@@ -51,6 +51,14 @@ apt_packages+=('libdrm-radeon1:i386')
 apt_packages+=('libdrm2:i386')
 apt_packages+=('libexpat1:i386')
 apt_packages+=('libgconf2-dev')
+apt_packages+=('libgl1-mesa-dri')
+apt_packages+=('libgl1-mesa-dri:i386')
+apt_packages+=('libgl1-mesa-glx')
+apt_packages+=('libgl1-mesa-glx:i386')
+apt_packages+=('libglapi-mesa')
+apt_packages+=('libglapi-mesa:i386')
+apt_packages+=('libglu1-mesa')
+apt_packages+=('libglu1-mesa:i386')
 apt_packages+=('libgnome-bluetooth8')
 apt_packages+=('libgstreamer-plugins-base0.10-dev')
 apt_packages+=('libgstreamer0.10-dev')
@@ -77,6 +85,7 @@ apt_packages+=('llvm-2.9-dev')
 apt_packages+=('llvm-2.9-runtime')
 apt_packages+=('llvm-dev')
 apt_packages+=('llvm-runtime')
+apt_packages+=('mesa-common-dev')
 apt_packages+=('nano')
 apt_packages+=('pulseaudio')
 apt_packages+=('pulseaudio-module-X11')
@@ -197,22 +206,6 @@ EOF
 tar -zxf xcb-repo-*.tgz
 echo "deb file://$PWD/xcb precise all" >> /etc/apt/sources.list
 
-# Install a patched version of mesa, per bug 1227637.  Origin of the packages themselves is unknown, as
-# these binaries were copied from the apt repositories used by puppet.
-# NOTE: if you're re-creating this, the tarball contains an `update.sh` which will rebuild the repository.
-tooltool_fetch <<'EOF'
-[
-{
-    "size": 11619521,
-    "digest": "2ec1dbb735d06a5ae8c1f31cd0a9256339a50b0221c84fc1f6e8ada3b3c2757c16df6e2ace4a66f68159950d46ddce563ecd71dd5c2d2d421b085168a86a52fd",
-    "algorithm": "sha512",
-    "filename": "mesa-repo-9.2.1-1ubuntu3~precise1mozilla1.tgz"
-}
-]
-EOF
-tar -zxf mesa-repo-*.tgz
-echo "deb file://$PWD/mesa precise all" >> /etc/apt/sources.list
-
 apt-get update
 
 apt-get -q -y --force-yes install \
@@ -224,19 +217,6 @@ apt-get -q -y --force-yes install \
 libxcb1_version=$(dpkg-query -s libxcb1 | grep ^Version | awk '{ print $2 }')
 [ "$libxcb1_version" = "1.8.1-2ubuntu2.1mozilla1" ] || exit 1
 
-apt-get -q -y --force-yes install \
-    libgl1-mesa-dev-lts-saucy:i386 \
-    libgl1-mesa-dri-lts-saucy \
-    libgl1-mesa-dri-lts-saucy:i386 \
-    libgl1-mesa-glx-lts-saucy \
-    libgl1-mesa-glx-lts-saucy:i386 \
-    libglapi-mesa-lts-saucy \
-    libglapi-mesa-lts-saucy:i386 \
-    libxatracker1-lts-saucy \
-    mesa-common-dev-lts-saucy:i386
-mesa_version=$(dpkg-query -s libgl1-mesa-dri-lts-saucy | grep ^Version | awk '{ print $2 }')
-[ "$mesa_version" = "9.2.1-1ubuntu3~precise1mozilla1" ] || exit 1
-
 # revert the list of repos
 cp sources.list.orig /etc/apt/sources.list
 apt-get update