Bug 1293293 - Use latest Mercurial on Taskcluster Docker images for L…

…inux r=me

automation/taskcluster/decision_task.yml

@@ -57,14 +57,14 @@ tasks:
         - "tc-treeherder.v2.{{project}}.{{revision}}.{{pushlog_id}}"
 
       payload:
-        image: "ttaubert/nss-ci:0.0.19"
+        image: "ttaubert/nss-ci:0.0.20"
 
         env:
           TC_OWNER: {{owner}}
           TC_SOURCE: {{{source}}}
           TC_PROJECT: {{project}}
           TC_COMMENT: '{{comment}}'
-          TC_IMAGE: "ttaubert/nss-ci:0.0.19"
+          TC_IMAGE: "ttaubert/nss-ci:0.0.20"
           NSS_PUSHLOG_ID: '{{pushlog_id}}'
           NSS_HEAD_REPOSITORY: '{{{url}}}'
           NSS_HEAD_REVISION: '{{revision}}'

automation/taskcluster/docker/setup.sh

@@ -2,11 +2,17 @@
 
 set -v -e -x
 
+# Update packages.
+export DEBIAN_FRONTEND=noninteractive
+apt-get -y update && apt-get -y upgrade
+
+# Need this to add keys for PPAs below.
+apt-get install -y --no-install-recommends apt-utils
+
 apt_packages=()
 apt_packages+=('build-essential')
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
-apt_packages+=('mercurial')
 apt_packages+=('npm')
 apt_packages+=('git')
 apt_packages+=('zlib1g-dev')
@@ -16,25 +22,20 @@ apt_packages+=('lib32z1-dev')
 apt_packages+=('gcc-multilib')
 apt_packages+=('g++-multilib')
 
-# Install prerequisites.
-apt-get -y update
-export DEBIAN_FRONTEND=noninteractive
-apt-get install -y --no-install-recommends curl apt-utils
-
-# Install the first round of packages.
-apt-get -y update
-apt-get install -y --no-install-recommends ${apt_packages[@]}
+# Latest Mercurial.
+apt_packages+=('mercurial')
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 41BD8711B1F0EC2B0D85B91CF59CE3A8323293EE
+echo "deb http://ppa.launchpad.net/mercurial-ppa/releases/ubuntu xenial main" > /etc/apt/sources.list.d/mercurial.list
 
-# gcc 6
-apt_packages=()
+# gcc 4.8 and 6
 apt_packages+=('g++-6')
 apt_packages+=('g++-4.8')
 apt_packages+=('g++-6-multilib')
 apt_packages+=('g++-4.8-multilib')
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
 echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" > /etc/apt/sources.list.d/toolchain.list
 
-# Install the second round of packages.
+# Install packages.
 apt-get -y update
 apt-get install -y --no-install-recommends ${apt_packages[@]}
 
@@ -58,6 +59,7 @@ locale-gen en_US.UTF-8
 dpkg-reconfigure locales
 
 # Cleanup.
+apt-get autoremove -y && apt-get clean
 rm -rf ~/.ccache ~/.cache
 apt-get clean
 apt-get autoclean