Update CMake used across all bots

Next LLVM upgrade will require CMake 3.4.3, and only Android is using a
new-enough CMake version.

Author: alexcrichton

slaves/dist/build_cmake.sh

@@ -2,8 +2,8 @@
 
 set -ex
 
-VERSION=3.3.2
-SHA256=e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22
+VERSION=3.6.0
+SHA256=fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670
 
 curl https://cmake.org/files/v${VERSION%\.*}/cmake-$VERSION.tar.gz | \
   tee >(sha256sum > cmake-$VERSION.tar.gz.sha256)                  | tar xzf -

slaves/linux-cross/Dockerfile

@@ -1,18 +1,17 @@
-FROM ubuntu:15.10
+FROM ubuntu:16.04
 
 RUN apt-get update
 RUN apt-get install -y --force-yes --no-install-recommends \
         curl make cmake git wget file \
-        python-dev python-pip stunnel \
+        python-dev python-pip python-setuptools stunnel \
         bzip2 xz-utils \
         g++ libc6-dev \
         g++-4.8-powerpc-linux-gnu libc6-dev-powerpc-cross \
         g++-4.8-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
         lib64gcc-4.8-dev-powerpc-cross libc6-dev-ppc64-powerpc-cross \
         lib64stdc++-4.8-dev-powerpc-cross \
-        software-properties-common bsdtar
-RUN add-apt-repository ppa:angelsl/mips-cross && apt-get update
-RUN apt-get install -y --force-yes --no-install-recommends \
+        bsdtar \
+        cmake \
         g++-5-mips-linux-gnu libc6-dev-mips-cross \
         g++-5-mipsel-linux-gnu libc6-dev-mipsel-cross
 
@@ -29,16 +28,16 @@ RUN                                              \
     ln -vs $f `echo $f | sed -e 's/-4.7$//'`;    \
   done
 
-# Install rumprun cross compiler
-WORKDIR /build
-COPY linux-cross/build_rumprun.sh /build/
-RUN /bin/bash build_rumprun.sh && rm -rf /build
-
 # Install buildbot and prep it to run
 RUN pip install buildbot-slave
 RUN groupadd -r rustbuild && useradd -m -r -g rustbuild rustbuild
 RUN mkdir /buildslave && chown rustbuild:rustbuild /buildslave
 
+# Install rumprun cross compiler
+WORKDIR /build
+COPY linux-cross/build_rumprun.sh /build/
+RUN /bin/bash build_rumprun.sh && rm -rf /build
+
 # Build/install crosstool-ng cross compilers
 # NOTE crosstool-ng can't be executed by root so we execute it under the
 # rustbuild user. /x-tools is the crosstool-ng output directory and /build is

slaves/linux/Dockerfile

@@ -1,18 +1,13 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 RUN dpkg --add-architecture i386
 RUN apt-get update
 RUN apt-get install -y \
         curl make xz-utils git \
         python-dev python-pip stunnel \
         g++-multilib libssl-dev libssl-dev:i386 gdb \
-        valgrind libc6-dbg:i386 software-properties-common
-
-# for cargo, we need cmake-3.1.2+ to avoid a cmake bug where it doesn't detect
-# OpenSSL-1.0.2.
-# See https://cmake.org/Bug/bug_relationship_graph.php?bug_id=15386
-RUN add-apt-repository ppa:george-edison55/cmake-3.x && apt-get update
-RUN apt-get install -y cmake
+        valgrind libc6-dbg:i386 \
+        cmake
 
 # Install buildbot and prep it to run
 RUN pip install buildbot-slave