From 78d6d7565a1acd87e7b67e5465b404aac3fc749d Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@mozilla.com>
Date: Thu, 11 Feb 2016 16:47:54 +0000
Subject: [PATCH] Bug 1242979: Install Valgrind on mochitest-valgrind test
 nodes; r=jseward

MozReview-Commit-ID: 3uCJfWkLCuQ
---
 testing/docker/desktop-test/Dockerfile        |  2 +-
 testing/docker/ubuntu1204-test-upd/Dockerfile |  2 +-
 testing/docker/ubuntu1204-test-upd/VERSION    |  2 +-
 testing/docker/ubuntu1204-test/VERSION        |  2 +-
 .../docker/ubuntu1204-test/system-setup.sh    | 25 +++++++++++++++++++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/testing/docker/desktop-test/Dockerfile b/testing/docker/desktop-test/Dockerfile
index 83be687f788..160491cf2d4 100644
--- a/testing/docker/desktop-test/Dockerfile
+++ b/testing/docker/desktop-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test-upd:0.1.6.20160105110000
+FROM          taskcluster/ubuntu1204-test-upd:0.1.7.20160211102400
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
 # Add utilities and configuration
diff --git a/testing/docker/ubuntu1204-test-upd/Dockerfile b/testing/docker/ubuntu1204-test-upd/Dockerfile
index e68c3afa576..320346b9c99 100644
--- a/testing/docker/ubuntu1204-test-upd/Dockerfile
+++ b/testing/docker/ubuntu1204-test-upd/Dockerfile
@@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test:0.1.6
+FROM          taskcluster/ubuntu1204-test:0.1.7
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ### update to latest from upstream repositories
diff --git a/testing/docker/ubuntu1204-test-upd/VERSION b/testing/docker/ubuntu1204-test-upd/VERSION
index 656ac21cfd9..ee0849e985f 100644
--- a/testing/docker/ubuntu1204-test-upd/VERSION
+++ b/testing/docker/ubuntu1204-test-upd/VERSION
@@ -1 +1 @@
-0.1.6.20160105110000
+0.1.7.20160211102400
diff --git a/testing/docker/ubuntu1204-test/VERSION b/testing/docker/ubuntu1204-test/VERSION
index c946ee6160c..11808190d4b 100644
--- a/testing/docker/ubuntu1204-test/VERSION
+++ b/testing/docker/ubuntu1204-test/VERSION
@@ -1 +1 @@
-0.1.6
+0.1.7
diff --git a/testing/docker/ubuntu1204-test/system-setup.sh b/testing/docker/ubuntu1204-test/system-setup.sh
index d5133f9b5bb..43bdfac31f0 100644
--- a/testing/docker/ubuntu1204-test/system-setup.sh
+++ b/testing/docker/ubuntu1204-test/system-setup.sh
@@ -206,6 +206,31 @@ EOF
 tar -zxf xcb-repo-*.tgz
 echo "deb file://$PWD/xcb precise all" >> /etc/apt/sources.list
 
+# Install Valgrind (trunk, late Jan 2016) and do some crude sanity
+# checks.  It has to go in /usr/local, otherwise it won't work.  Copy
+# the launcher binary to /usr/bin, though, so that direct invokations
+# of /usr/bin/valgrind also work.  Also install libc6-dbg since
+# Valgrind won't work at all without the debug symbols for libc.so and
+# ld.so being available.
+tooltool_fetch <<'EOF'
+[
+{
+    "size": 41331092,
+    "visibility": "public",
+    "digest": "a89393c39171b8304fc262094a650df9a756543ffe9fbec935911e7b86842c4828b9b831698f97612abb0eca95cf7f7b3ff33ea7a9b0313b30c9be413a5efffc",
+    "algorithm": "sha512",
+    "filename": "valgrind-15775-3206-ubuntu1204.tgz"
+}
+]
+EOF
+cp valgrind-15775-3206-ubuntu1204.tgz /tmp
+(cd / && tar xzf /tmp/valgrind-15775-3206-ubuntu1204.tgz)
+rm /tmp/valgrind-15775-3206-ubuntu1204.tgz
+cp /usr/local/bin/valgrind /usr/bin/valgrind
+apt-get install -y libc6-dbg
+valgrind --version
+valgrind date
+
 apt-get update
 
 apt-get -q -y --force-yes install \