Bug 1131152 - Update tester image to use tc-vcs and download mozharness r=garndt

--HG--
extra : rebase_source : 36fe51e73ba81c49d3c0861de4a25c5857699df9

testing/docker/tester/Dockerfile

@@ -3,16 +3,17 @@ MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
 # Add utilities and configuration
 ADD           b2g-desktop-config.py         /home/worker/b2g-desktop-config.py
-ADD           test-setup.sh                 /tmp/test-setup.sh
 ADD           dot-config                    /home/worker/.config
 ADD           dot-pulse                     /home/worker/.pulse
 ADD           bin                           /home/worker/bin
 ADD           mozharness_configs            /home/worker/mozharness_configs
 
 # Run test setup script
-USER          root
-RUN           ["/tmp/test-setup.sh"]
-ENV           PATH $PATH:/home/worker/bin
+RUN pip install virtualenv;
+RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
+RUN chown -R worker:worker /home/worker/* /home/worker/.*
+RUN npm install -g taskcluster-vcs@2.1.3
+ENV PATH $PATH:/home/worker/bin
 
 # TODO Re-enable worker when bug 1093833 lands
 #USER          worker

testing/docker/tester/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

testing/docker/tester/bin/entrypoint

@@ -1,5 +1,8 @@
 #! /bin/bash -vex
 
+test $MOZHARNESS_REPOSITORY # mozharness repository
+test $MOZHARNESS_REV # mozharness revision
+
 # This file is intended to be used as the "entrypoint" or first command in the
 # docker image. It uses "eval" so it takes place of the usual /bin/bash -c
 # <stuff> conventions you need when running a docker image. Primarily it
@@ -9,4 +12,13 @@
 Xvfb :0 -nolisten tcp -screen 0 1600x1200x24 2>/dev/null &
 export DISPLAY=:0
 
+# First check if the mozharness directory is available. This is intended to be
+# used locally in development to test mozharness changes:
+#
+#   $ docker -v your_mozharness:/home/worker/mozharness ...
+#
+if [ ! -d mozharness ]; then
+  tc-vcs checkout mozharness $MOZHARNESS_REPOSITORY $MOZHARNESS_REPOSITORY $MOZHARNESS_REV
+fi
+
 eval $@

testing/docker/tester/bin/pull_gaia.sh

@@ -1,12 +1,3 @@
 #!/bin/bash -vex
-
-
 gaia_dir=/home/worker/gaia
-
-# Some mozharness scripts are harcoded to use $PWD/gaia for the gaia repo and 
-# will delete the directory and clone again if .hg doesn't exist.  Does not work
-# well when trying to cache
-if [ ! -d "$gaia_dir/.hg" ]; then
-  echo "Cloning gaia into $gaia_dir"
-  hg clone https://hg.mozilla.org/integration/gaia-central/ $gaia_dir
-fi
+tc-vcs checkout $gaia_dir https://hg.mozilla.org/integration/gaia-central/

testing/docker/tester/test-setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash -ve
-
-pip install virtualenv;
-mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
-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/.*

testing/taskcluster/tasks/test.yml

@@ -19,6 +19,9 @@ task:
   payload:
     image: '{{#docker_image}}tester{{/docker_image}}'
     maxRunTime: 3600
+    env:
+      MOZHARNESS_REPOSITORY: '{{mozharness_repository}}'
+      MOZHARNESS_REV: '{{mozharness_rev}}'
 
   extra:
     treeherder: