Bug 1302773 - Install tox in docker image in MozReview; r?dustin
MozReview-Commit-ID: 3jiVsZOrvW9
--- a/taskcluster/ci/source-test/python-tests.yml
+++ b/taskcluster/ci/source-test/python-tests.yml
@@ -93,18 +93,17 @@ mozharness:
implementation: docker-worker
docker-image: {in-tree: "lint"}
max-run-time: 1800
run:
using: run-task
cache-dotcache: true
command: >
cd /home/worker/checkouts/gecko/testing/mozharness &&
- /usr/bin/pip2 install tox &&
- /home/worker/.local/bin/tox -e py27-hg4.1
+ /usr/local/bin/tox -e py27-hg4.1
run-on-projects:
- integration
- release
when:
files-changed:
- 'testing/mozharness/**'
mozlint:
--- a/taskcluster/docker/lint/Dockerfile
+++ b/taskcluster/docker/lint/Dockerfile
@@ -14,16 +14,18 @@ ADD topsrcdir/testing/mozharness/externa
# %include taskcluster/docker/recipes/install-node.sh
ADD topsrcdir/taskcluster/docker/recipes/install-node.sh /build/install-node.sh
# %include taskcluster/docker/recipes/install-mercurial.sh
ADD topsrcdir/taskcluster/docker/recipes/install-mercurial.sh /build/install-mercurial.sh
ADD system-setup.sh /tmp/system-setup.sh
# %include tools/lint/flake8/flake8_requirements.txt
ADD topsrcdir/tools/lint/flake8/flake8_requirements.txt /tmp/flake8_requirements.txt
+# %include tools/lint/tox/tox_requirements.txt
+ADD topsrcdir/tools/lint/tox/tox_requirements.txt /tmp/tox_requirements.txt
RUN bash /tmp/system-setup.sh
# %include taskcluster/docker/recipes/run-task
ADD topsrcdir/taskcluster/docker/recipes/run-task /home/worker/bin/run-task
RUN chown -R worker:worker /home/worker/bin && chmod 755 /home/worker/bin/*
# Set variable normally configured at login, by the shells parent process, these
# are taken from GNU su manual
--- a/taskcluster/docker/lint/system-setup.sh
+++ b/taskcluster/docker/lint/system-setup.sh
@@ -46,10 +46,18 @@ cd /build
###
# Flake8 Setup
###
cd /setup
pip install --require-hashes -r /tmp/flake8_requirements.txt
+###
+# tox Setup
+###
+
+cd /setup
+
+pip install --require-hashes -r /tmp/tox_requirements.txt
+
cd /
rm -rf /setup
new file mode 100644
--- /dev/null
+++ b/tools/lint/tox/tox_requirements.txt
@@ -0,0 +1,4 @@
+pluggy==0.4.0 --hash=sha256:d2766caddfbbc8ef641d47da556d2ae3056860ce4d553aa04009e42b76a09951
+py==1.4.33 --hash=sha256:81b5e37db3cc1052de438375605fb5d3b3e97f950f415f9143f04697c684d7eb
+tox==2.7.0 --hash=sha256:0f37ea637ead4a5bbae91531b0bf8fd327c7152e20255e5960ee180598228d21
+virtualenv==15.1.0 --hash=sha256:39d88b533b422825d644087a21e78c45cf5af0ef7a99a1fc9fbb7b481e5c85b0