From 406627c7bd09b1a36d01866f88a4b4cef000ac1d Mon Sep 17 00:00:00 2001 From: Rob Wood Date: Wed, 26 Nov 2014 10:11:31 -0800 Subject: [PATCH] Bug 1090404 : Update docker tester image to use gecko-tree base image r=lightsofapollo --HG-- extra : rebase_source : a5393f1882c14b5ae122e9b496c637833887702c extra : source : 7cf8f96e169b953fc538419dfe214e5949a4cf56 --- testing/docker/tester/Dockerfile | 5 +- testing/docker/tester/VERSION | 2 +- testing/docker/tester/test-setup.sh | 104 ++++++++++------------------ 3 files changed, 39 insertions(+), 72 deletions(-) diff --git a/testing/docker/tester/Dockerfile b/testing/docker/tester/Dockerfile index d77172a77c52..434f91009210 100644 --- a/testing/docker/tester/Dockerfile +++ b/testing/docker/tester/Dockerfile @@ -1,10 +1,7 @@ -FROM quay.io/mozilla/gecko-base +FROM quay.io/mozilla/base:0.0.2 MAINTAINER Jonas Finnemann Jensen # Add utilities and configuration -COPY fetch-artifacts.py /home/worker/fetch-artifacts.py -COPY b2g-desktop-tests.sh /home/worker/b2g-desktop-tests.sh -COPY b2g-emulator-tests.sh /home/worker/b2g-emulator-tests.sh COPY b2g-desktop-config.py /home/worker/b2g-desktop-config.py COPY test-setup.sh /tmp/test-setup.sh COPY dot-config /home/worker/.config diff --git a/testing/docker/tester/VERSION b/testing/docker/tester/VERSION index 4e379d2bfeab..bcab45af15a0 100644 --- a/testing/docker/tester/VERSION +++ b/testing/docker/tester/VERSION @@ -1 +1 @@ -0.0.2 +0.0.3 diff --git a/testing/docker/tester/test-setup.sh b/testing/docker/tester/test-setup.sh index 822556f4995e..2752e6a8e6cc 100755 --- a/testing/docker/tester/test-setup.sh +++ b/testing/docker/tester/test-setup.sh @@ -2,77 +2,47 @@ ### Firefox Test Setup -apt-get update -apt-get install -y \ - alsa-base \ - alsa-utils \ - bluez-alsa \ - bluez-alsa:i386 \ - bluez-cups \ - bluez-gstreamer \ - g++-multilib \ - gcc-multilib \ - gir1.2-gnomebluetooth-1.0 \ - gstreamer0.10-alsa \ - libasound2-plugins:i386 \ - libcanberra-pulse \ - libdrm-intel1:i386 \ - libdrm-nouveau1a:i386 \ - libdrm-radeon1:i386 \ - libdrm2:i386 \ - libexpat1:i386 \ - libgnome-bluetooth8 \ - libllvm2.9 \ - libllvm3.0:i386 \ - libncurses5:i386 \ - libpulse-mainloop-glib0:i386 \ - libpulsedsp:i386 \ - libsdl1.2debian:i386 \ - libsox-fmt-alsa \ - libx11-xcb1:i386 \ - libxcb-glx0:i386 \ - libxcb-glx0 \ - libxdamage1:i386 \ - libxfixes3:i386 \ - libxxf86vm1:i386 \ - libxxf86vm1 \ - llvm \ - llvm-2.9 \ - llvm-2.9-dev \ - llvm-2.9-runtime \ - llvm-dev \ - llvm-runtime \ - pulseaudio-module-bluetooth \ - pulseaudio-module-gconf \ - pulseaudio-module-X11 \ - pulseaudio \ - python-pip +yum install -y \ + alsa-utils \ + bluez-alsa \ + bluez-alsa.i686 \ + bluez-cups \ + curl \ + dbus-devel \ + dbus-glib-devel \ + GConf2-devel \ + iw \ + libcurl-devel \ + libdrm.i686 \ + libdrm-devel.i686 \ + libnotify-devel \ + libX11.i686 \ + libX11-devel \ + libxcb.i686 \ + libXdamage.i686 \ + libXfixes.i686 \ + libXxf86vm.i686 \ + llvm \ + llvm-devel \ + ncurses-devel \ + ncurses-devel.i686 \ + openssl-devel \ + pulseaudio-module-gconf \ + pulseaudio-module-x11 \ + pulseaudio \ + yasm \ + python-devel \ + python-pip \ + dbus-python \ + wget \ + ; -# Mozilla-patched mesa libs required for many reftests -- see bug 975034 -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_amd64.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_amd64.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -wget http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libgl1-mesa-dri_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libglapi-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libgl1-mesa-glx_8.0.4-0ubuntu0.6mozilla1_amd64.deb -dpkg -i libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_i386.deb -dpkg -i libglu1-mesa_8.0.4-0ubuntu0.6mozilla1_amd64.deb +# Remove cached packages. Cached package takes up a lot of space and +# distributing them to workers is wasteful. +yum clean all pip install virtualenv; mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; hg clone http://hg.mozilla.org/build/mozharness/ echo 'Xvfb :0 -nolisten tcp -screen 0 1600x1200x24 &> /dev/null &' >> .bashrc chown -R worker:worker /home/worker/* /home/worker/.* - -### Clean up from setup -# Remove the setup.sh setup, we don't really need this script anymore, deleting -# it keeps the image as clean as possible. -#rm $0; echo "Deleted $0";