Bug 1238469 - Part 4: Remove custom mozharness configs from docker image; r=ahal
--- a/testing/docker/tester/Dockerfile
+++ b/testing/docker/tester/Dockerfile
@@ -1,18 +1,15 @@
FROM taskcluster/base-test:0.1.3
MAINTAINER Jonas Finnemann Jensen <jopsen@gmail.com>
# 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://s3-us-west-2.amazonaws.com/test-caching/packages/linux64-stackwalk /usr/local/bin/linux64-minidump_stackwalk
ADD https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
COPY tc-vcs-config.yml /etc/taskcluster-vcs.yml
# Run test setup script
RUN chmod u+x /home/worker/bin/buildbot_step
RUN chmod u+x /usr/local/bin/linux64-minidump_stackwalk
RUN apt-get install -y python-pip && pip install virtualenv;
--- a/testing/docker/tester/VERSION
+++ b/testing/docker/tester/VERSION
@@ -1,1 +1,1 @@
-0.4.6
+0.4.7
deleted file mode 100644
--- a/testing/docker/tester/b2g-desktop-config.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# This is a template config file for b2g desktop unittest production.
-import os
-
-config = {
- # mozharness options
- "application": "b2g",
-
- "find_links": [
- "http://pypi.pub.build.mozilla.org/pub",
- ],
- "pip_index": False,
-
- "default_actions": [
- 'clobber',
- 'read-buildbot-config',
- 'download-and-extract',
- 'create-virtualenv',
- 'install',
- 'run-tests',
- ],
- "download_symbols": "ondemand",
- "download_minidump_stackwalk": True,
-
- "run_file_names": {
- "mochitest": "runtestsb2g.py",
- "reftest": "runreftestb2g.py",
- },
- "in_tree_config": "config/mozharness/b2g_desktop_config.py",
-}
deleted file mode 100644
--- a/testing/docker/tester/buildprops.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "properties": {
- "buildername": ""
- },
- "sourcestamp": {
- "changes": []
- }
-}
deleted file mode 100644
--- a/testing/docker/tester/mozharness_configs/emulator_override.py
+++ /dev/null
@@ -1,4 +0,0 @@
-config = {
- "exes": {},
- "busybox_url": ""
-}
deleted file mode 100644
--- a/testing/docker/tester/mozharness_configs/gaia_integration_override.py
+++ /dev/null
@@ -1,4 +0,0 @@
-config = {
- "exes": {},
- "xre_url": ""
-}
deleted file mode 100644
--- a/testing/docker/tester/mozharness_configs/remove_executables.py
+++ /dev/null
@@ -1,6 +0,0 @@
-config = {
- # We bake this directly into the tester image now...
- "download_minidump_stackwalk": False,
- "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
- "exes": {}
-}