Backed out changeset fd09b9651dc6 (bug 1324492) for being a possible cause of valgrind leaks a=backout
authorWes Kocher <wkocher@mozilla.com>
Fri, 30 Dec 2016 10:57:11 -0800
changeset 358514 9123c3b05739298c5b6a1dbe8aee34f1acd30af9
parent 358513 ddf39a63ecf049f7088918066847665d81fbfd86
child 358515 c470c3365f40a87fd5247df5500bc31435be41dd
push id17
push userfmarier@mozilla.com
push dateFri, 13 Jan 2017 22:14:57 +0000
reviewersbackout
bugs1324492
milestone53.0a1
backs outfd09b9651dc64078fc6438f54c7bb83368a54731
Backed out changeset fd09b9651dc6 (bug 1324492) for being a possible cause of valgrind leaks a=backout
taskcluster/docker/centos6-build-upd/Dockerfile
taskcluster/docker/centos6-build-upd/VERSION
taskcluster/docker/centos6-build/VERSION
taskcluster/docker/centos6-build/system-setup.sh
taskcluster/docker/desktop-build/Dockerfile
--- a/taskcluster/docker/centos6-build-upd/Dockerfile
+++ b/taskcluster/docker/centos6-build-upd/Dockerfile
@@ -1,9 +1,9 @@
-FROM          taskcluster/centos6-build:0.1.7
+FROM          taskcluster/centos6-build:0.1.6
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ### update to latest from upstream repositories
 # if this becomes a long list of packages, consider bumping the
 # centos6-build version
 RUN yum update -y
 
 # Set a default command useful for debugging
--- a/taskcluster/docker/centos6-build-upd/VERSION
+++ b/taskcluster/docker/centos6-build-upd/VERSION
@@ -1,1 +1,1 @@
-0.1.7.20161229150900
+0.1.6.20160329195300
--- a/taskcluster/docker/centos6-build/VERSION
+++ b/taskcluster/docker/centos6-build/VERSION
@@ -1,1 +1,1 @@
-0.1.7
+0.1.6
--- a/taskcluster/docker/centos6-build/system-setup.sh
+++ b/taskcluster/docker/centos6-build/system-setup.sh
@@ -263,16 +263,17 @@ install npm
 # enough X to run `make check` and do a PGO build
 install Xvfb
 install xvinfo
 
 # required for building OS X tools
 install patch
 install libuuid-devel
 install openssl-static
+install cmake
 install subversion
 run
 EOF
 
 BUILD=/root/build
 mkdir $BUILD
 
 # for the builds below, there's no sense using ccache
@@ -423,32 +424,16 @@ virtualenv==13.1.2
 # sha256: wJnELXTi1SC2HdNyzZlrD6dgXAZheDT9exPHm5qaWzA
 mercurial==3.7.3
 EOF
 peep install -r requirements.txt
 
 # TC-VCS
 npm install -g taskcluster-vcs@2.3.18
 
-# CMake 3.7.1
-cd $BUILD
-tooltool_fetch <<'EOF'
-[
-{
-    "size": 7361172,
-    "digest": "0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629",
-    "algorithm": "sha512",
-    "filename": "cmake-3.7.1.tar.gz",
-    "unpack": true
-}
-]
-EOF
-cd cmake-3.7.1
-./bootstrap && make install
-
 # Ninja
 cd $BUILD
 tooltool_fetch <<'EOF'
 [
 {
     "size": 174501,
     "digest": "551a9e14b95c2d2ddad6bee0f939a45614cce86719748dc580192dd122f3671e3d95fd6a6fb3facb2d314ba100d61a004af4df77f59df119b1b95c6fe8c38875",
     "algorithm": "sha512",
--- a/taskcluster/docker/desktop-build/Dockerfile
+++ b/taskcluster/docker/desktop-build/Dockerfile
@@ -1,10 +1,10 @@
 # TODO remove VOLUME below when the base image is updated next.
-FROM          taskcluster/centos6-build-upd:0.1.7.20161229150900
+FROM          taskcluster/centos6-build-upd:0.1.6.20160329195300
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 # TODO remove when base image is updated
 VOLUME /home/worker/workspace
 VOLUME /home/worker/tooltool-cache
 
 # Add build scripts; these are the entry points from the taskcluster worker, and
 # operate on environment variables