From 27bc12b7580a7c21c874c9fc5fdb63607bbe1fec Mon Sep 17 00:00:00 2001
From: Edgar Chen <echen@mozilla.com>
Date: Mon, 11 Jan 2016 22:17:18 +0800
Subject: [PATCH] Bug 1238469 - Part 4: Remove custom mozharness configs from
 docker image; r=ahal

--HG--
extra : commitid : 7abo4shgA54
extra : rebase_source : 26f8f4c57485d6d9528471475ca0c1a934757a35
extra : amend_source : 29f470f7057c8183a97bba9e2c8b02b6a8eea726
---
 testing/docker/tester/Dockerfile              |  5 +---
 testing/docker/tester/VERSION                 |  2 +-
 testing/docker/tester/b2g-desktop-config.py   | 29 -------------------
 testing/docker/tester/buildprops.json         |  8 -----
 .../mozharness_configs/emulator_override.py   |  4 ---
 .../gaia_integration_override.py              |  4 ---
 .../mozharness_configs/remove_executables.py  |  6 ----
 7 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 testing/docker/tester/b2g-desktop-config.py
 delete mode 100644 testing/docker/tester/buildprops.json
 delete mode 100644 testing/docker/tester/mozharness_configs/emulator_override.py
 delete mode 100644 testing/docker/tester/mozharness_configs/gaia_integration_override.py
 delete mode 100644 testing/docker/tester/mozharness_configs/remove_executables.py

diff --git a/testing/docker/tester/Dockerfile b/testing/docker/tester/Dockerfile
index ff015ba85496..547417ffad07 100644
--- a/testing/docker/tester/Dockerfile
+++ b/testing/docker/tester/Dockerfile
@@ -2,12 +2,9 @@ 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
@@ -18,7 +15,7 @@ RUN chmod u+x /usr/local/bin/linux64-minidump_stackwalk
 RUN apt-get install -y python-pip && pip install virtualenv;
 RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
 RUN npm install -g taskcluster-vcs@2.3.12
-RUN npm install -g taskcluster-npm-cache@1.3.1
+RUN npm install -g taskcluster-npm-cache@1.3.3
 RUN npm install -g node-gyp
 RUN rm -Rf .cache && mkdir -p .cache
 ENV PATH $PATH:/home/worker/bin
diff --git a/testing/docker/tester/VERSION b/testing/docker/tester/VERSION
index ef52a648073d..f90568270955 100644
--- a/testing/docker/tester/VERSION
+++ b/testing/docker/tester/VERSION
@@ -1 +1 @@
-0.4.6
+0.4.7
diff --git a/testing/docker/tester/b2g-desktop-config.py b/testing/docker/tester/b2g-desktop-config.py
deleted file mode 100644
index feb0692d161e..000000000000
--- 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",
-}
diff --git a/testing/docker/tester/buildprops.json b/testing/docker/tester/buildprops.json
deleted file mode 100644
index f0967b02625d..000000000000
--- a/testing/docker/tester/buildprops.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "properties": {
-    "buildername": ""
-  },
-  "sourcestamp": {
-    "changes": []
-  }
-}
diff --git a/testing/docker/tester/mozharness_configs/emulator_override.py b/testing/docker/tester/mozharness_configs/emulator_override.py
deleted file mode 100644
index 677c6ebf9b0f..000000000000
--- a/testing/docker/tester/mozharness_configs/emulator_override.py
+++ /dev/null
@@ -1,4 +0,0 @@
-config = {
-    "exes": {},
-    "busybox_url": ""
-}
diff --git a/testing/docker/tester/mozharness_configs/gaia_integration_override.py b/testing/docker/tester/mozharness_configs/gaia_integration_override.py
deleted file mode 100644
index 8168e8012e4c..000000000000
--- a/testing/docker/tester/mozharness_configs/gaia_integration_override.py
+++ /dev/null
@@ -1,4 +0,0 @@
-config = {
-    "exes": {},
-    "xre_url": ""
-}
diff --git a/testing/docker/tester/mozharness_configs/remove_executables.py b/testing/docker/tester/mozharness_configs/remove_executables.py
deleted file mode 100644
index f55a7e809b4d..000000000000
--- 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": {}
-}