Bug 1637381: Add python-zstandard to ubuntu test images so they can unpack toolchains r=glandium
authorChris AtLee <catlee@mozilla.com>
Thu, 21 May 2020 13:28:45 +0000
changeset 531429 aab5979b57e2654a22d0041a330343b8ff1665c7
parent 531428 4aae9dc67310a0d7cc8eae3c415205b9930c153d
child 531430 245952ad63ad8d52a0d73a987fa9a58b40027808
push id37439
push userbtara@mozilla.com
push dateThu, 21 May 2020 21:49:34 +0000
treeherdermozilla-central@92c11f0bf14b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1637381
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1637381: Add python-zstandard to ubuntu test images so they can unpack toolchains r=glandium Differential Revision: https://phabricator.services.mozilla.com/D75356
taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh
--- a/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
+++ b/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
@@ -88,28 +88,32 @@ apt_packages+=('x11vnc')
 
 # Bug 1176031: need `xset` to disable screensavers
 apt_packages+=('x11-xserver-utils')
 
 # use Ubuntu's Python-2.7 (2.7.3 on Precise)
 apt_packages+=('python-dev')
 apt_packages+=('python-pip')
 
+apt_packages+=('python3-pip')
+
 apt-get update
 # This allows ubuntu-desktop to be installed without human interaction
 export DEBIAN_FRONTEND=noninteractive
 apt-get install -y -f "${apt_packages[@]}"
 
 dpkg-reconfigure locales
 
 . /setup/common.sh
 . /setup/install-mercurial.sh
 
 pip install pip==9.0.3
 pip install virtualenv==15.2.0
+pip install zstandard==0.13.0
+pip3 install zstandard==0.13.0
 
 . /setup/install-node.sh
 
 # Install custom-built Debian packages.  These come from a set of repositories
 # packaged in tarballs on tooltool to make them replicable.  Because they have
 # inter-dependenices, we install all repositories first, then perform the
 # installation.
 cp /etc/apt/sources.list sources.list.orig
--- a/taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh
+++ b/taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh
@@ -69,16 +69,17 @@ apt_packages+=('llvm-dev')
 apt_packages+=('llvm-runtime')
 apt_packages+=('mesa-common-dev')
 apt_packages+=('net-tools')
 apt_packages+=('pulseaudio')
 apt_packages+=('pulseaudio-module-bluetooth')
 apt_packages+=('pulseaudio-module-gconf')
 apt_packages+=('python-dev')
 apt_packages+=('python-pip')
+apt_packages+=('python3-pip')
 apt_packages+=('qemu-kvm')
 apt_packages+=('rlwrap')
 apt_packages+=('screen')
 apt_packages+=('software-properties-common')
 apt_packages+=('sudo')
 apt_packages+=('ttf-dejavu')
 apt_packages+=('ubuntu-desktop')
 apt_packages+=('unzip')
@@ -124,16 +125,19 @@ apt-get install -y -f "${apt_packages[@]
 . /setup/install-mercurial.sh
 . /setup/install-node.sh
 
 # Upgrade pip and install virtualenv to specified versions.
 pip install --upgrade pip==19.2.3
 hash -r
 pip install virtualenv==15.2.0
 
+pip install zstandard==0.13.0
+pip3 install zstandard==0.13.0
+
 # Build a list of packages to purge from the image.
 apt_packages=()
 apt_packages+=('*cheese*')
 apt_packages+=('example-content')
 apt_packages+=('git')
 apt_packages+=('gnome-calendar')
 apt_packages+=('gnome-initial-setup')
 apt_packages+=('gnome-mahjongg')