Bug 1124340 - Add buildbot step lines to tester image r=garndt
authorjlal@mozilla.com
Sat, 07 Feb 2015 00:55:46 -0800
changeset 241989 ffe79ad5cb11ff985d5f744c54db7242bb1df532
parent 241988 2d3a5cf7a0d8fede1ae89cfb928e36a365e056d1
child 241990 65c988d47b3cb1c41728ca5b725c1f7c6dfa794a
push id629
push userjlal@mozilla.com
push dateTue, 10 Feb 2015 18:55:13 +0000
reviewersgarndt
bugs1124340
milestone38.0a1
Bug 1124340 - Add buildbot step lines to tester image r=garndt
testing/docker/tester/Dockerfile
testing/docker/tester/VERSION
testing/docker/tester/bin/entrypoint
--- a/testing/docker/tester/Dockerfile
+++ b/testing/docker/tester/Dockerfile
@@ -3,19 +3,21 @@ MAINTAINER    Jonas Finnemann Jensen <jo
 
 # Add utilities and configuration
 COPY           b2g-desktop-config.py         /home/worker/b2g-desktop-config.py
 COPY           dot-config                    /home/worker/.config
 COPY           dot-pulse                     /home/worker/.pulse
 COPY           bin                           /home/worker/bin
 COPY           mozharness_configs            /home/worker/mozharness_configs
 COPY           buildprops.json               /home/worker/buildprops.json
+ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
 
 
 # Run test setup script
+RUN chmod u+x /home/worker/bin/buildbot_step
 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
--- a/testing/docker/tester/VERSION
+++ b/testing/docker/tester/VERSION
@@ -1,1 +1,1 @@
-0.0.12
+0.0.13
--- a/testing/docker/tester/bin/entrypoint
+++ b/testing/docker/tester/bin/entrypoint
@@ -1,9 +1,9 @@
-#! /bin/bash -vex
+#! /bin/bash -ex
 
 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
 # bootstraps any processes that need to run outside of mozharness (like Xvfb)
@@ -13,12 +13,12 @@ Xvfb :0 -nolisten tcp -screen 0 1600x120
 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
+  buildbot_step 'Checkout mozharness' tc-vcs checkout mozharness $MOZHARNESS_REPOSITORY $MOZHARNESS_REPOSITORY $MOZHARNESS_REV
 fi
 
-eval $@
+buildbot_step 'Running tests' $@