Bug 1237182: Removing unused buildbot support r=Callek
☠☠ backed out by 9b3ba34a7a1a ☠ ☠
authorChris AtLee <catlee@mozilla.com>
Fri, 04 May 2018 13:51:35 -0400
changeset 417774 67d2aa892562cb25bff4a7707b016f20560873a3
parent 417773 0f11165c90a147d9f163ed4d5339bd7e8d1b9d1c
child 417775 9e0bfa596858608080a471b6d15b0dbcbc6da3a7
push id33980
push userebalazs@mozilla.com
push dateFri, 11 May 2018 09:35:12 +0000
treeherdermozilla-central@8e9a4a323f0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1237182
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1237182: Removing unused buildbot support r=Callek MozReview-Commit-ID: EjclZgc864L
taskcluster/ci/test/compiled.yml
taskcluster/ci/test/marionette.yml
taskcluster/ci/test/misc.yml
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/reftest.yml
taskcluster/ci/test/talos.yml
taskcluster/ci/test/web-platform.yml
taskcluster/ci/test/xpcshell.yml
taskcluster/taskgraph/transforms/job/mozharness_test.py
taskcluster/taskgraph/transforms/tests.py
testing/mozharness/configs/android/android_common.py
testing/mozharness/configs/builds/releng_base_android_64_builds.py
testing/mozharness/configs/builds/releng_base_linux_32_builds.py
testing/mozharness/configs/builds/releng_base_linux_64_builds.py
testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
testing/mozharness/configs/marionette/prod_config.py
testing/mozharness/configs/marionette/windows_config.py
testing/mozharness/configs/multi_locale/ash_android-x86.json
testing/mozharness/configs/multi_locale/ash_android.json
testing/mozharness/configs/multi_locale/jamun_android-armv6.json
testing/mozharness/configs/multi_locale/jamun_android-x86.json
testing/mozharness/configs/multi_locale/jamun_android.json
testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
testing/mozharness/configs/multi_locale/mozilla-beta_android.json
testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
testing/mozharness/configs/multi_locale/mozilla-central_android.json
testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
testing/mozharness/configs/multi_locale/mozilla-release_android.json
testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
testing/mozharness/configs/partner_repacks/release_mozilla-release_android.py
testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_android.py
testing/mozharness/configs/raptor/linux64_config_taskcluster.py
testing/mozharness/configs/raptor/linux_config.py
testing/mozharness/configs/raptor/mac_config.py
testing/mozharness/configs/raptor/windows_config.py
testing/mozharness/configs/raptor/windows_vm_config.py
testing/mozharness/configs/releases/updates_firefox_devedition.py
testing/mozharness/configs/single_locale/ash_android-api-16.py
testing/mozharness/configs/single_locale/jamun_android-api-16.py
testing/mozharness/configs/single_locale/maple_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
testing/mozharness/configs/single_locale/tc_common.py
testing/mozharness/configs/single_locale/try_android-api-16.py
testing/mozharness/configs/talos/linux64_config_taskcluster.py
testing/mozharness/configs/talos/linux_config.py
testing/mozharness/configs/talos/mac_config.py
testing/mozharness/configs/talos/windows_config.py
testing/mozharness/configs/talos/windows_taskcluster_config.py
testing/mozharness/configs/talos/windows_vm_config.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_taskcluster_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
testing/mozharness/configs/web_platform_tests/prod_config.py
testing/mozharness/configs/web_platform_tests/prod_config_windows.py
testing/mozharness/docs/mozharness.mozilla.testing.rst
testing/mozharness/mach_commands.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
testing/mozharness/mozharness/mozilla/testing/mozpool.py
testing/mozharness/mozharness/mozilla/testing/raptor.py
testing/mozharness/mozharness/mozilla/testing/talos.py
testing/mozharness/mozharness/mozilla/testing/testbase.py
testing/mozharness/scripts/android_emulator_unittest.py
testing/mozharness/scripts/bouncer_submitter.py
testing/mozharness/scripts/desktop_unittest.py
testing/mozharness/scripts/fx_desktop_build.py
testing/mozharness/scripts/marionette.py
testing/mozharness/scripts/release/publish_balrog.py
testing/mozharness/scripts/release/updates.py
testing/mozharness/scripts/web_platform_tests.py
testing/mozharness/unit.sh
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -1,12 +1,11 @@
 job-defaults:
     e10s: false
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py
                 default: desktop_unittest.py
         config:
             by-test-platform:
                 android.*:
                     - android/android_common.py
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -1,12 +1,11 @@
 job-defaults:
     suite: marionette
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py
                 default: marionette.py
         config:
             by-test-platform:
                 android.*:
                     - android/android_common.py
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -3,17 +3,16 @@ geckoview:
     suite: geckoview
     treeherder-symbol: gv
     instance-size: xlarge
     loopback-video: true
     e10s: false
     target: geckoview_example.apk
     mozharness:
         script: android_emulator_unittest.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 android-4.2-x86/opt:
                     - android/android_common.py
                     - android/androidx86.py
                 android.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
@@ -30,17 +29,16 @@ geckoview-junit:
     target: geckoview-androidTest.apk
     max-run-time: 3600
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 3
             default: 1
     mozharness:
         script: android_emulator_unittest.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 android-4.2-x86/opt:
                     - android/android_common.py
                     - android/androidx86.py
                 android.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
@@ -55,17 +53,16 @@ robocop:
     chunks:
         by-test-platform:
             # android-4.3-arm7-api-16/debug -- not run
             android-4.3-arm7-api-16/opt: 4
     loopback-video: true
     e10s: false
     mozharness:
         script: android_emulator_unittest.py
-        no-read-buildbot-config: true
         config:
             - android/android_common.py
             - android/androidarm_4_3.py
         extra-options:
             - --test-suite=robocop
 
 telemetry-tests-client:
     description: "Telemetry tests client run"
@@ -116,17 +113,16 @@ test-verify:
                     - android/androidarm_4_3.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
-        no-read-buildbot-config: true
         extra-options:
             - --verify
 
 test-verify-gpu:
     description: "Extra verification of tests modified on this push on gpu instances"
     suite: test-verify
     treeherder-symbol: TVg
     loopback-video: true
@@ -160,17 +156,16 @@ test-verify-gpu:
                     - android/androidarm_4_3.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
-        no-read-buildbot-config: true
         extra-options:
             - --verify
             - --gpu-required
 
 test-coverage:
     description: "Per-test coverage"
     suite: test-coverage
     treeherder-symbol: TC
@@ -200,11 +195,10 @@ test-coverage:
                     - android/androidarm_4_3.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
-        no-read-buildbot-config: true
         extra-options:
             - --per-test-coverage
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -1,11 +1,10 @@
 job-defaults:
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py
                 default: desktop_unittest.py
         config:
             by-test-platform:
                 android-4.2-x86/opt:
                     - android/android_common.py
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -1,11 +1,10 @@
 job-defaults:
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py
                 default: desktop_unittest.py
         config:
             by-test-platform:
                 android.*:
                     - android/android_common.py
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -7,17 +7,16 @@ job-defaults:
             linux64-ccov/.*: 3
             default: default
     virtualization:
         by-test-platform:
             windows10-64-ccov/.*: virtual
             default: hardware
     mozharness:
         script: talos_script.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
                 windows10-64-ccov/debug:
                     - talos/windows_vm_config.py
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -1,14 +1,13 @@
 job-defaults:
     instance-size: xlarge
     max-run-time: 5400
     mozharness:
         script: web_platform_tests.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - web_platform_tests/prod_config_windows_taskcluster.py
                 macosx.*:
                     - web_platform_tests/prod_config.py
                 default:
                     - web_platform_tests/prod_config.py
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -1,11 +1,10 @@
 job-defaults:
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py
                 default: desktop_unittest.py
         config:
             by-test-platform:
                 android-4.2-x86/opt:
                     - android/android_common.py
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -176,18 +176,16 @@ def mozharness_test_on_docker(config, jo
     else:
         env['MOZHARNESS_URL'] = {'task-reference': mozharness_url}
 
     command.extend([
         '--',
         '/builds/worker/bin/test-linux.sh',
     ])
 
-    if mozharness.get('no-read-buildbot-config'):
-        command.append("--no-read-buildbot-config")
     command.extend([
         {"task-reference": "--installer-url=" + installer_url},
         {"task-reference": "--test-packages-url=" + test_packages_url(taskdesc)},
     ])
     command.extend(mozharness.get('extra-options', []))
 
     # TODO: remove the need for run['chunked']
     if mozharness.get('chunked') or test['chunks'] > 1:
@@ -286,18 +284,16 @@ def mozharness_test_on_generic_worker(co
         ]
 
     for mh_config in mozharness['config']:
         cfg_path = 'mozharness/configs/' + mh_config
         if is_windows:
             cfg_path = normpath(cfg_path)
         mh_command.extend(['--cfg', cfg_path])
     mh_command.extend(mozharness.get('extra-options', []))
-    if mozharness.get('no-read-buildbot-config'):
-        mh_command.append('--no-read-buildbot-config')
     mh_command.extend(['--installer-url', installer_url])
     mh_command.extend(['--test-packages-url', test_packages_url(taskdesc)])
     if mozharness.get('download-symbols'):
         if isinstance(mozharness['download-symbols'], basestring):
             mh_command.extend(['--download-symbols', mozharness['download-symbols']])
         else:
             mh_command.extend(['--download-symbols', 'true'])
     if mozharness.get('include-blob-upload-branch'):
@@ -392,18 +388,16 @@ def mozharness_test_on_native_engine(con
         env['NEED_XVFB'] = 'false'
 
     script = 'test-macosx.sh' if is_macosx else 'test-linux.sh'
     worker['context'] = '{}/raw-file/{}/taskcluster/scripts/tester/{}'.format(
         config.params['head_repository'], config.params['head_rev'], script
     )
 
     command = worker['command'] = ["./{}".format(script)]
-    if mozharness.get('no-read-buildbot-config'):
-        command.append("--no-read-buildbot-config")
     command.extend([
         {"task-reference": "--installer-url=" + installer_url},
         {"task-reference": "--test-packages-url=" + test_packages_url(taskdesc)},
     ])
     if mozharness.get('include-blob-upload-branch'):
         command.append('--blob-upload-branch=' + config.params['project'])
     command.extend(mozharness.get('extra-options', []))
 
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -278,20 +278,16 @@ test_description_schema = Schema({
 
         # the artifact name (including path) to test on the build task; this is
         # generally set in a per-kind transformation
         Optional('build-artifact-name'): basestring,
 
         # If true, tooltool downloads will be enabled via relengAPIProxy.
         Required('tooltool-downloads'): bool,
 
-        # This mozharness script also runs in Buildbot and tries to read a
-        # buildbot config file, so tell it not to do so in TaskCluster
-        Required('no-read-buildbot-config'): bool,
-
         # Add --blob-upload-branch=<project> mozharness parameter
         Optional('include-blob-upload-branch'): bool,
 
         # The setting for --download-symbols (if omitted, the option will not
         # be passed to mozharness)
         Optional('download-symbols'): Any(True, 'ondemand'),
 
         # If set, then MOZ_NODE_PATH=/usr/local/bin/node is included in the
@@ -444,17 +440,16 @@ def set_defaults(config, tests):
         test.setdefault('loopback-video', False)
         test.setdefault('docker-image', {'in-tree': 'desktop1604-test'})
         test.setdefault('max-run-time', 3600)
         test.setdefault('checkout', False)
 
         test['mozharness'].setdefault('extra-options', [])
         test['mozharness'].setdefault('requires-signed-builds', False)
         test['mozharness'].setdefault('tooltool-downloads', False)
-        test['mozharness'].setdefault('no-read-buildbot-config', False)
         test['mozharness'].setdefault('set-moz-node-path', False)
         test['mozharness'].setdefault('chunked', False)
         test['mozharness'].setdefault('chunking-args', 'this-chunk')
         yield test
 
 
 @transforms.add
 def validate(config, tests):
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -3,17 +3,16 @@
 # This configuration should be combined with platform-specific mozharness
 # configuration such as androidarm_4_3.py, or similar.
 
 import os
 
 config = {
     "default_actions": [
         'clobber',
-        'read-buildbot-config',
         'setup-avds',
         'start-emulator',
         'download-and-extract',
         'create-virtualenv',
         'verify-emulator',
         'install',
         'run-tests',
     ],
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -6,17 +6,16 @@ config = {
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
         'multi-l10n',
         'update',  # decided by query_is_nightly()
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     'max_build_output_timeout': 0,
     # decides whether we want to use moz_sign_cmd in env
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-fennec-geoloc-api.key',
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -10,17 +10,16 @@ config = {
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -9,17 +9,16 @@ config = {
     # releng_base_linux_64_builds.py
 
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@@ -5,17 +5,16 @@ config = {
     ######## MACOSX CROSS GENERIC CONFIG KEYS/VAlUES
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
         'update',  # decided by query_is_nightly()
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
--- a/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
@@ -3,17 +3,16 @@ import os
 config = {
     #########################################################################
     ######## LINUX GENERIC CONFIG KEYS/VAlUES
     # if you are updating this with custom 32 bit keys/values please add them
     # below under the '32 bit specific' code block otherwise, update in this
     # code block and also make sure this is synced with
     # releng_base_linux_64_builds.py
 
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
@@ -8,21 +8,20 @@ config = {
     # code block and also make sure this is synced with
     # releng_base_linux_64_builds.py
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'vcs_share_base': '/builds/hg-shared',
-    # allows triggering of dependent jobs when --artifact try syntax is detected on buildbot
+    # allows triggering of dependent jobs when --artifact try syntax is detected
     'perfherder_extra_options': ['artifact'],
     #########################################################################
 
 
     #########################################################################
     ###### 32 bit specific ######
     'base_name': 'Linux_%(branch)s_Artifact_build',
     'platform': 'linux',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py
@@ -8,23 +8,22 @@ config = {
     # code block and also make sure this is synced with
     # releng_base_linux_64_builds.py
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'vcs_share_base': '/builds/hg-shared',
     # debug specific
     'debug_build': True,
-    # allows triggering of test jobs when --artifact try syntax is detected on buildbot
+    # allows triggering of test jobs when --artifact try syntax is detected
     'perfherder_extra_options': ['artifact'],
     #########################################################################
 
 
     #########################################################################
     ###### 32 bit specific ######
     'base_name': 'Linux_%(branch)s_Artifact_build',
     'platform': 'linux',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
@@ -1,29 +1,28 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
     ],
     'vcs_share_base': '/builds/hg-shared',
-    # allows triggering of dependent jobs when --artifact try syntax is detected on buildbot
+    # allows triggering of dependent jobs when --artifact try syntax is detected
     'perfherder_extra_options': ['artifact'],
     #########################################################################
 
 
     #########################################################################
     ###### 64 bit specific ######
     'base_name': 'Linux_x86-64_%(branch)s_Artifact_build',
     'platform': 'linux64',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
@@ -1,23 +1,22 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     'vcs_share_base': '/builds/hg-shared',
     # debug specific
     'debug_build': True,
     # decides whether we want to use moz_sign_cmd in env
-    # allows triggering of test jobs when --artifact try syntax is detected on buildbot
+    # allows triggering of test jobs when --artifact try syntax is detected
     'perfherder_extra_options': ['artifact'],
     #########################################################################
 
 
     #########################################################################
     ###### 64 bit specific ######
     'base_name': 'Linux_x86-64_%(branch)s_Artifact_build',
     'platform': 'linux64',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
@@ -15,15 +15,15 @@ config = {
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         ## 64 bit specific
-        'PATH': '/tools/buildbot/bin:/usr/local/bin:/bin:\
+        'PATH': ':/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
     },
     'mozconfig_variant': 'rusttests',
     'artifact_flag_build_variant_in_try': None,
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
@@ -12,16 +12,16 @@ config = {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
-        'PATH': '/tools/buildbot/bin:/usr/local/bin:/bin:\
+        'PATH': '/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
         'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
     },
     'mozconfig_variant': 'rusttests-debug',
     'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'vcs_share_base': '/builds/hg-shared',
     'perfherder_extra_options': ['static-analysis'],
     #########################################################################
 
 
     #########################################################################
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py
@@ -1,13 +1,12 @@
 config = {
     'default_actions': ['package-source'],
     'objdir': 'obj-firefox',
     'stage_platform': 'source',  # Not used, but required by the script
-    'buildbot_json_path': 'buildprops.json',
     'app_ini_path': 'FAKE',  # Not used, but required by the script
     'env': {
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'TINDERBOX_OUTPUT': '1',
         'LC_ALL': 'C',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux64/source',
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'vcs_share_base': '/builds/hg-shared',
     'perfherder_extra_options': ['static-analysis'],
     #########################################################################
 
 
     #########################################################################
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'vcs_share_base': '/builds/hg-shared',
     'perfherder_extra_options': ['static-analysis'],
     #########################################################################
 
 
     #########################################################################
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
@@ -3,21 +3,20 @@ import os
 config = {
     #########################################################################
     ######## MACOSX GENERIC CONFIG KEYS/VAlUES
 
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'vcs_share_base': '/builds/hg-shared',
-    # allows triggering of dependent jobs when --artifact try syntax is detected on buildbot
+    # allows triggering of dependent jobs when --artifact try syntax is detected
     'perfherder_extra_options': ['artifact'],
     #########################################################################
 
 
     #########################################################################
     ###### 64 bit specific ######
     'base_name': 'OS X 10.7 %(branch)s_Artifact_build',
     'platform': 'macosx64',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py
@@ -3,23 +3,22 @@ import os
 config = {
     #########################################################################
     ######## MACOSX GENERIC CONFIG KEYS/VAlUES
 
     'default_actions': [
         'clobber',
         'build',
     ],
-    "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'vcs_share_base': '/builds/hg-shared',
     # debug specific
     'debug_build': True,
-    # allows triggering of test jobs when --artifact try syntax is detected on buildbot
+    # allows triggering of test jobs when --artifact try syntax is detected
     'perfherder_extra_options': ['artifact'],
     #########################################################################
 
 
     #########################################################################
     ###### 64 bit specific ######
     'base_name': 'OS X 10.7 %(branch)s_Artifact_build',
     'platform': 'macosx64',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
@@ -10,17 +10,16 @@ config = {
     'stage_platform': 'win32-add-on-devel',
     #### 32 bit build specific #####
     'env': {
         'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
                 '%s' % (os.environ.get('path')),
         'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
         'TINDERBOX_OUTPUT': '1',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/c/builds',
     },
     'mozconfig_variant': 'add-on-devel',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
@@ -11,17 +11,16 @@ config = {
     'debug_build': True,
     #### 32 bit build specific #####
     'env': {
         'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
                 '%s' % (os.environ.get('path')),
         'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
         'TINDERBOX_OUTPUT': '1',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/c/builds',
     },
     'mozconfig_variant': 'debug',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
@@ -13,17 +13,16 @@ releng.manifest",
     'perfherder_extra_options': ['static-analysis'],
     #### 32 bit build specific #####
     'env': {
         'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
                 '%s' % (os.environ.get('path')),
         'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
         'TINDERBOX_OUTPUT': '1',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/c/builds',
     },
     'mozconfig_variant': 'debug-static-analysis',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
@@ -9,17 +9,16 @@ config = {
     ],
     'stage_platform': 'win64-add-on-devel',
     #### 64 bit build specific #####
     'env': {
         'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
                 '%s' % (os.environ.get('path')),
         'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
         'TINDERBOX_OUTPUT': '1',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/c/builds',
     },
     'mozconfig_variant': 'add-on-devel',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
@@ -10,17 +10,16 @@ config = {
     'stage_platform': 'win64-debug',
     'debug_build': True,
     #### 64 bit build specific #####
     'env': {
         'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
                 '%s' % (os.environ.get('path')),
         'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
         'TINDERBOX_OUTPUT': '1',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/c/builds',
     },
     'mozconfig_variant': 'debug',
--- a/testing/mozharness/configs/marionette/prod_config.py
+++ b/testing/mozharness/configs/marionette/prod_config.py
@@ -5,21 +5,18 @@ HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
     # marionette options
     "marionette_address": "localhost:2828",
     "test_manifest": "unit-tests.ini",
 
     "vcs_share_base": HG_SHARE_BASE_DIR,
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_actions": [
         'clobber',
-        'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
         'install',
         'run-tests',
     ],
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
--- a/testing/mozharness/configs/marionette/windows_config.py
+++ b/testing/mozharness/configs/marionette/windows_config.py
@@ -7,21 +7,18 @@ config = {
     "test_manifest": "unit-tests.ini",
 
     "virtualenv_path": 'venv',
     "exes": {
         'python': 'c:/mozilla-build/python27/python',
         'hg': 'c:/mozilla-build/hg/hg',
     },
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_actions": [
         'clobber',
-        'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
         'install',
         'run-tests',
     ],
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
--- a/testing/mozharness/configs/multi_locale/ash_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/ash_android-x86.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/projects/ash",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/ash_android.json
+++ b/testing/mozharness/configs/multi_locale/ash_android.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/projects/ash",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
@@ -5,20 +5,16 @@
     "locales_file": "build/mobile/locales/l10n-changesets.json",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/jamun",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/jamun_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
@@ -5,20 +5,16 @@
     "locales_file": "build/mobile/locales/l10n-changesets.json",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/jamun",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/jamun_android.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android.json
@@ -5,20 +5,16 @@
     "locales_file": "build/mobile/locales/l10n-changesets.json",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/jamun",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-aurora",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
     "hg_l10n_tag": "default",
     "l10n_dir": "mozilla-aurora",
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-aurora",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
     "hg_l10n_tag": "default",
     "l10n_dir": "mozilla-aurora",
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-aurora",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
     "hg_l10n_tag": "default",
     "l10n_dir": "mozilla-aurora",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/mozilla-central",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/mozilla-central",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/mozilla-central",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
@@ -6,20 +6,16 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "hg_l10n_tag": "default",
     "l10n_dir": "l10n-central",
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
     "l10n_dir": "l10n-central",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
 }
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
     "l10n_dir": "l10n-central",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
 }
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
@@ -6,27 +6,18 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
     "l10n_dir": "l10n-central",
     "mozilla_dir": "build"
 }
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
     "l10n_dir": "l10n-central",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
 }
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
     "l10n_dir": "l10n-central",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
 }
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
@@ -6,27 +6,18 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "production",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
     "required_config_vars": ["tag_override"],
     "l10n_dir": "l10n-central",
     "mozilla_dir": "build"
 }
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
     "required_config_vars": ["tag_override", "user_repo_override"],
     "l10n_dir": "mozilla-beta",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
 }
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
     "required_config_vars": ["tag_override", "user_repo_override"],
     "l10n_dir": "mozilla-beta",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
 }
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
@@ -6,27 +6,18 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
     "required_config_vars": ["tag_override", "user_repo_override"],
     "l10n_dir": "mozilla-beta",
     "mozilla_dir": "build"
 }
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
     "required_config_vars": ["tag_override", "user_repo_override"],
     "l10n_dir": "mozilla-release",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
 }
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
@@ -6,28 +6,19 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
     "required_config_vars": ["tag_override", "user_repo_override"],
     "l10n_dir": "mozilla-release",
     "mozilla_dir": "build",
     "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
 }
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
@@ -6,27 +6,18 @@
     "locales_platform": "android-multilocale",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US", "multi"],
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
         "branch": "default",
         "dest": "build"
     },{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    },{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
         "branch": "default",
         "dest": "tools"
     }],
-    "l10n_repos": [{
-        "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "branch": "default",
-        "dest": "build/configs"
-    }],
     "vcs_share_base": "/builds/hg-shared",
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
     "required_config_vars": ["tag_override", "user_repo_override"],
     "l10n_dir": "mozilla-release",
     "mozilla_dir": "build"
 }
deleted file mode 100644
--- a/testing/mozharness/configs/partner_repacks/release_mozilla-release_android.py
+++ /dev/null
@@ -1,47 +0,0 @@
-FTP_SERVER = "stage.mozilla.org"
-FTP_USER = "ffxbld"
-FTP_SSH_KEY = "~/.ssh/ffxbld_rsa"
-FTP_UPLOAD_BASE_DIR = "/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d"
-DOWNLOAD_BASE_URL = "http://%s%s" % (FTP_SERVER, FTP_UPLOAD_BASE_DIR)
-APK_BASE_NAME = "fennec-%(version)s.%(locale)s.android-arm.apk"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-KEYSTORE = "/home/cltsign/.android/android-release.keystore"
-KEY_ALIAS = "release"
-
-config = {
-    "log_name": "partner_repack",
-    "locales_file": "buildbot-configs/mozilla/l10n-changesets_mobile-release.json",
-    "additional_locales": ['en-US'],
-    "platforms": ["android"],
-    "repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-    }],
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-    "ftp_upload_base_dir": FTP_UPLOAD_BASE_DIR,
-    "ftp_ssh_key": FTP_SSH_KEY,
-    "ftp_user": FTP_USER,
-    "ftp_server": FTP_SERVER,
-    "installer_base_names": {
-        "android": APK_BASE_NAME,
-    },
-    "partner_config": {
-        "google-play": {},
-    },
-    "download_unsigned_base_subdir": "unsigned/%(platform)s/%(locale)s",
-    "download_base_url": DOWNLOAD_BASE_URL,
-
-    "release_config_file": "buildbot-configs/mozilla/release-fennec-mozilla-release.py",
-
-    "default_actions": ["clobber", "pull", "download", "repack", "upload-unsigned-bits", "summary"],
-
-    # signing (optional)
-    "keystore": KEYSTORE,
-    "key_alias": KEY_ALIAS,
-    "exes": {
-        # This path doesn't exist and this file probably doesn't work
-        # Comment out to avoid confusion
-#        "jarsigner": "/tools/jdk-1.6.0_17/bin/jarsigner",
-        "zipalign": "/tools/android-sdk-r8/tools/zipalign",
-    },
-}
deleted file mode 100644
--- a/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_android.py
+++ /dev/null
@@ -1,52 +0,0 @@
-FTP_SERVER = "dev-stage01.srv.releng.scl3.mozilla.com"
-FTP_USER = "ffxbld"
-FTP_SSH_KEY = "~/.ssh/ffxbld_rsa"
-FTP_UPLOAD_BASE_DIR = "/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d"
-#DOWNLOAD_BASE_URL = "http://%s%s" % (FTP_SERVER, FTP_UPLOAD_BASE_DIR)
-DOWNLOAD_BASE_URL = "https://ftp-ssl.mozilla.org/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d"
-#DOWNLOAD_BASE_URL = "http://dev-stage01.build.mozilla.org/pub/mozilla.org/mobile/candidates/11.0b1-candidates/build1/"
-APK_BASE_NAME = "fennec-%(version)s.%(locale)s.android-arm.apk"
-#APK_BASE_NAME = "fennec-11.0b1.%(locale)s.android-arm.apk"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-#KEYSTORE = "/home/cltsign/.android/android-release.keystore"
-KEYSTORE = "/home/cltbld/.android/android.keystore"
-#KEY_ALIAS = "release"
-KEY_ALIAS = "nightly"
-
-config = {
-    "log_name": "partner_repack",
-    "locales_file": "buildbot-configs/mozilla/l10n-changesets_mobile-release.json",
-    "additional_locales": ['en-US'],
-    "platforms": ["android"],
-    "repos": [{
-        "repo": "https://hg.mozilla.org/build/buildbot-configs",
-        "branch": "default",
-    }],
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-    "ftp_upload_base_dir": FTP_UPLOAD_BASE_DIR,
-    "ftp_ssh_key": FTP_SSH_KEY,
-    "ftp_user": FTP_USER,
-    "ftp_server": FTP_SERVER,
-    "installer_base_names": {
-        "android": APK_BASE_NAME,
-    },
-    "partner_config": {
-        "google-play": {},
-    },
-    "download_unsigned_base_subdir": "unsigned/%(platform)s/%(locale)s",
-    "download_base_url": DOWNLOAD_BASE_URL,
-
-    "release_config_file": "buildbot-configs/mozilla/release-fennec-mozilla-release.py",
-
-    "default_actions": ["clobber", "pull", "download", "repack", "upload-unsigned-bits", "summary"],
-
-    # signing (optional)
-    "keystore": KEYSTORE,
-    "key_alias": KEY_ALIAS,
-    "exes": {
-        # This path doesn't exist and this file probably doesn't work
-        # Comment out to avoid confusion
-#        "jarsigner": "/tools/jdk-1.6.0_17/bin/jarsigner",
-        "zipalign": "/tools/android-sdk-r8/tools/zipalign",
-    },
-}
--- a/testing/mozharness/configs/raptor/linux64_config_taskcluster.py
+++ b/testing/mozharness/configs/raptor/linux64_config_taskcluster.py
@@ -10,29 +10,27 @@ MINIDUMP_STACKWALK_PATH = "linux64-minid
 exes = {
     'python': PYTHON,
 }
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
 INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
 
 config = {
     "log_name": "raptor",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": INSTALLER_PATH,
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
     "exes": exes,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
--- a/testing/mozharness/configs/raptor/linux_config.py
+++ b/testing/mozharness/configs/raptor/linux_config.py
@@ -6,28 +6,26 @@ if platform.architecture()[0] == '64bit'
     TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
     MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
 else:
     TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
     MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
 
 config = {
     "log_name": "raptor",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "setup-mitmproxy",
         "run-tests",
     ],
     "default_blob_upload_servers": [
--- a/testing/mozharness/configs/raptor/mac_config.py
+++ b/testing/mozharness/configs/raptor/mac_config.py
@@ -9,28 +9,26 @@ SCREEN_RESOLUTION_CHECK = {
 }
 
 import os
 
 VENV_PATH = '%s/build/venv' % os.getcwd()
 
 config = {
     "log_name": "raptor",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
--- a/testing/mozharness/configs/raptor/windows_config.py
+++ b/testing/mozharness/configs/raptor/windows_config.py
@@ -3,17 +3,16 @@ import socket
 import sys
 
 PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python27/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'build/venv')
 
 config = {
     "log_name": "raptor",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "pip_index": False,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "virtualenv_modules": ['pywin32', 'raptor', 'mozinstall'],
@@ -24,17 +23,16 @@ config = {
         'mozinstall': ['%s/scripts/python' % VENV_PATH,
                        '%s/scripts/mozinstall-script.py' % VENV_PATH],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
         'tooltool.py': [PYTHON, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
--- a/testing/mozharness/configs/raptor/windows_vm_config.py
+++ b/testing/mozharness/configs/raptor/windows_vm_config.py
@@ -3,17 +3,16 @@ import socket
 import sys
 
 PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python27/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'build/venv')
 
 config = {
     "log_name": "raptor",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "pip_index": False,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "virtualenv_modules": ['pywin32', 'raptor', 'mozinstall'],
@@ -23,17 +22,16 @@ config = {
                          '%s/scripts/easy_install-2.7-script.py' % VENV_PATH],
         'mozinstall': ['%s/scripts/python' % VENV_PATH,
                        '%s/scripts/mozinstall-script.py' % VENV_PATH],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "run-tests",
     ],
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
--- a/testing/mozharness/configs/releases/updates_firefox_devedition.py
+++ b/testing/mozharness/configs/releases/updates_firefox_devedition.py
@@ -19,18 +19,17 @@ config = {
     "download_domain": "download.mozilla.org",
     "balrog_url": "https://aus5.mozilla.org",
     "balrog_username": "balrog-ffxbld",
     "update_channels": {
         "aurora": {
             "version_regex": r"^.*$",
             "requires_mirrors": True,
             "patcher_config": "mozDevedition-branch-patcher2.cfg",
-            # Allow to override the patcher config product name, regardless
-            # the value set by buildbot properties
+            # Allow to override the patcher config product name
             "patcher_config_product_override": "firefox",
             "update_verify_channel": "aurora-localtest",
             "mar_channel_ids": [],
             "channel_names": ["aurora", "aurora-localtest", "aurora-cdntest"],
             "rules_to_update": ["devedition-cdntest", "devedition-localtest"],
             "publish_rules": [10],
         },
     },
--- a/testing/mozharness/configs/single_locale/ash_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-16.py
@@ -5,17 +5,16 @@ OBJDIR = "obj-firefox"
 EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
     "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
     "nightly_build": True,
     'balrog_credentials_file': 'oauth.txt',
     "tools_repo": "https://hg.mozilla.org/build/tools",
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
@@ -4,17 +4,16 @@ BRANCH = "jamun"
 MOZILLA_DIR = BRANCH
 EN_US_BINARY_URL = None     # No build has been uploaded to archive.m.o
 
 config = {
     "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": "obj-firefox",
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
     "nightly_build": True,
     'balrog_credentials_file': 'oauth.txt',
     "tools_repo": "https://hg.mozilla.org/build/tools",
--- a/testing/mozharness/configs/single_locale/maple_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/maple_android-api-16.py
@@ -5,17 +5,16 @@ MOZILLA_DIR = BRANCH
 EN_US_BINARY_URL = "http://archive.mozilla.org/pub/" \
                    "mobile/nightly/latest-maple-android-api-16/en-US"
 
 config = {
     "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": "obj-firefox",
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
     "nightly_build": True,
     'balrog_credentials_file': 'oauth.txt',
     "tools_repo": "https://hg.mozilla.org/build/tools",
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
@@ -7,17 +7,16 @@ OBJDIR = "obj-firefox"
 EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
     "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
     "nightly_build": True,
     'balrog_credentials_file': 'oauth.txt',
     "tools_repo": "https://hg.mozilla.org/build/tools",
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
@@ -6,17 +6,16 @@ OBJDIR = "obj-firefox"
 EN_US_BINARY_URL = None
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
     "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "locales_platform": "android-api-16",
     "ignore_locales": ["en-US"],
     "balrog_credentials_file": "oauth.txt",
     "tools_repo": "https://hg.mozilla.org/build/tools",
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
@@ -7,17 +7,16 @@ OBJDIR = "obj-firefox"
 EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
     "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
     "nightly_build": True,
     'balrog_credentials_file': 'oauth.txt',
     "tools_repo": "https://hg.mozilla.org/build/tools",
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
@@ -6,17 +6,16 @@ OBJDIR = "obj-firefox"
 EN_US_BINARY_URL = None
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
     "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "locales_platform": "android-api-16",
     "ignore_locales": ["en-US"],
     "balrog_credentials_file": "oauth.txt",
     "tools_repo": "https://hg.mozilla.org/build/tools",
--- a/testing/mozharness/configs/single_locale/tc_common.py
+++ b/testing/mozharness/configs/single_locale/tc_common.py
@@ -1,7 +1,4 @@
 config = {
     "mozilla_dir": "src/",
     "simple_name_move": True,
-
-    # Override the buildbot path to not read it
-    "buildbot_json_path": None,
 }
--- a/testing/mozharness/configs/single_locale/try_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-16.py
@@ -5,17 +5,16 @@ MOZILLA_DIR = BRANCH
 EN_US_BINARY_URL = "http://archive.mozilla.org/pub/" \
                    "mobile/nightly/latest-mozilla-central-android-api-16/en-US"
 
 config = {
     "branch": "try",
     "log_name": "single_locale",
     "objdir": "obj-firefox",
     "is_automation": True,
-    "buildbot_json_path": "buildprops.json",
     "force_clobber": True,
     "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
     "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
     'balrog_credentials_file': 'oauth.txt',
     "tools_repo": "https://hg.mozilla.org/build/tools",
     "tooltool_config": {
--- a/testing/mozharness/configs/talos/linux64_config_taskcluster.py
+++ b/testing/mozharness/configs/talos/linux64_config_taskcluster.py
@@ -15,24 +15,22 @@ else:
 exes = {
     'python': PYTHON,
 }
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
 INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
 
 config = {
     "log_name": "talos",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": INSTALLER_PATH,
     "virtualenv_path": VENV_PATH,
     "exes": exes,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "setup-mitmproxy",
         "run-tests",
     ],
     "default_blob_upload_servers": [
--- a/testing/mozharness/configs/talos/linux_config.py
+++ b/testing/mozharness/configs/talos/linux_config.py
@@ -6,23 +6,21 @@ if platform.architecture()[0] == '64bit'
     TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux64/releng.manifest"
     MINIDUMP_STACKWALK_PATH = "linux64-minidump_stackwalk"
 else:
     TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/releng.manifest"
     MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
 
 config = {
     "log_name": "talos",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "setup-mitmproxy",
         "run-tests",
     ],
     "default_blob_upload_servers": [
--- a/testing/mozharness/configs/talos/mac_config.py
+++ b/testing/mozharness/configs/talos/mac_config.py
@@ -9,23 +9,21 @@ SCREEN_RESOLUTION_CHECK = {
 }
 
 import os
 
 VENV_PATH = '%s/build/venv' % os.getcwd()
 
 config = {
     "log_name": "talos",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "setup-mitmproxy",
         "run-tests",
     ],
     "run_cmd_checks_enabled": True,
--- a/testing/mozharness/configs/talos/windows_config.py
+++ b/testing/mozharness/configs/talos/windows_config.py
@@ -3,28 +3,26 @@ import socket
 import sys
 
 PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python27/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'build/venv')
 
 config = {
     "log_name": "talos",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "exes": {
         'python': PYTHON,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
         'tooltool.py': [PYTHON, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "setup-mitmproxy",
         "run-tests",
     ],
     "default_blob_upload_servers": [
--- a/testing/mozharness/configs/talos/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/talos/windows_taskcluster_config.py
@@ -3,17 +3,16 @@ import socket
 import sys
 
 PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'venv')
 
 config = {
     "log_name": "talos",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "exes": {
         'python': PYTHON,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
--- a/testing/mozharness/configs/talos/windows_vm_config.py
+++ b/testing/mozharness/configs/talos/windows_vm_config.py
@@ -3,27 +3,25 @@ import socket
 import sys
 
 PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python27/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'build/venv')
 
 config = {
     "log_name": "talos",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "exes": {
         'python': PYTHON,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
         "setup-mitmproxy",
         "run-tests",
     ],
     "default_blob_upload_servers": [
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -29,17 +29,16 @@ else:
     MINIDUMP_STACKWALK_PATH = "linux32-minidump_stackwalk"
     VALGRIND_SUPP_ARCH = os.path.join(VALGRIND_SUPP_DIR,
                                       "i386-pc-linux-gnu.sup")
     NODEJS_PATH = "node-linux-x86/bin/node"
     NODEJS_TOOLTOOL_MANIFEST_PATH = "config/tooltool-manifests/linux32/nodejs.manifest"
 
 #####
 config = {
-    "buildbot_json_path": "buildprops.json",
     ###
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
     "xpcshell_name": XPCSHELL_NAME,
     "exe_suffix": EXE_SUFFIX,
     "run_file_names": {
         "mochitest": "runtests.py",
         "reftest": "runreftest.py",
@@ -275,17 +274,16 @@ config = {
                 "../scripts/external_tools/machine-configuration.json"],
             "architectures": ["32bit"],
             "halt_on_failure": True,
             "enabled": ADJUST_MOUSE_AND_SCREEN
         },
     ],
     "vcs_output_timeout": 1000,
     "minidump_save_path": "%(abs_work_dir)s/../minidumps",
-    "buildbot_max_log_size": 209715200,
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
     "unstructured_flavors": {"xpcshell": [],
                             "gtest": [],
                             "mozmill": [],
                             "cppunittest": [],
                             "jittest": [],
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -3,17 +3,16 @@ import os
 # OS Specifics
 INSTALLER_PATH = os.path.join(os.getcwd(), "installer.dmg")
 XPCSHELL_NAME = 'xpcshell'
 EXE_SUFFIX = ''
 DISABLE_SCREEN_SAVER = False
 ADJUST_MOUSE_AND_SCREEN = False
 #####
 config = {
-    "buildbot_json_path": "buildprops.json",
     ###
     "installer_path": INSTALLER_PATH,
     "xpcshell_name": XPCSHELL_NAME,
     "exe_suffix": EXE_SUFFIX,
     "run_file_names": {
         "mochitest": "runtests.py",
         "reftest": "runreftest.py",
         "xpcshell": "runxpcshelltests.py",
@@ -217,17 +216,16 @@ config = {
                 "../scripts/external_tools/machine-configuration.json"],
             "architectures": ["32bit"],
             "halt_on_failure": True,
             "enabled": ADJUST_MOUSE_AND_SCREEN
         },
     ],
     "vcs_output_timeout": 1000,
     "minidump_save_path": "%(abs_work_dir)s/../minidumps",
-    "buildbot_max_log_size": 52428800,
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
     "unstructured_flavors": {"xpcshell": [],
                             "gtest": [],
                             "mozmill": [],
                             "cppunittest": [],
                             "jittest": [],
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -302,17 +302,16 @@ config = {
             ],
             'architectures': ['32bit', '64bit'],
             'halt_on_failure': True,
             'enabled': True
         },
     ],
     "vcs_output_timeout": 1000,
     "minidump_save_path": "%(abs_work_dir)s/../minidumps",
-    "buildbot_max_log_size": 52428800,
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
     "structured_suites": ["reftest"],
     'blob_uploader_auth_file': 'C:/builds/oauth.txt',
     "download_minidump_stackwalk": True,
     "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
     "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -6,17 +6,16 @@ ABS_WORK_DIR = os.path.join(os.getcwd(),
 BINARY_PATH = os.path.join(ABS_WORK_DIR, "application", "firefox", "firefox.exe")
 INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.zip")
 XPCSHELL_NAME = 'xpcshell.exe'
 EXE_SUFFIX = '.exe'
 DISABLE_SCREEN_SAVER = False
 ADJUST_MOUSE_AND_SCREEN = True
 #####
 config = {
-    "buildbot_json_path": "buildprops.json",
     "exes": {
         'python': sys.executable,
         'hg': 'c:/mozilla-build/hg/hg',
     },
     ###
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
     "xpcshell_name": XPCSHELL_NAME,
@@ -241,17 +240,16 @@ config = {
                 "../scripts/external_tools/machine-configuration.json"],
             "architectures": ["32bit"],
             "halt_on_failure": True,
             "enabled": ADJUST_MOUSE_AND_SCREEN
         },
     ],
     "vcs_output_timeout": 1000,
     "minidump_save_path": "%(abs_work_dir)s/../minidumps",
-    "buildbot_max_log_size": 52428800,
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
     "unstructured_flavors": {"xpcshell": [],
                             "gtest": [],
                             "mozmill": [],
                             "cppunittest": [],
                             "jittest": [],
--- a/testing/mozharness/configs/web_platform_tests/prod_config.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config.py
@@ -11,18 +11,16 @@ config = {
         "--processes=1",
         "--config=%(test_path)s/wptrunner.ini",
         "--ca-cert-path=%(test_path)s/certs/cacert.pem",
         "--host-key-path=%(test_path)s/certs/web-platform.test.key",
         "--host-cert-path=%(test_path)s/certs/web-platform.test.pem",
         "--certutil-binary=%(test_install_path)s/bin/certutil",
     ],
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
 
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
 
     "download_minidump_stackwalk": True,
 
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
@@ -20,18 +20,16 @@ config = {
         "--certutil-binary=%(test_install_path)s/bin/certutil",
     ],
 
     "exes": {
         'python': sys.executable,
         'hg': 'c:/mozilla-build/hg/hg',
     },
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
 
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
 
     "download_minidump_stackwalk": True,
 
--- a/testing/mozharness/docs/mozharness.mozilla.testing.rst
+++ b/testing/mozharness/docs/mozharness.mozilla.testing.rst
@@ -7,24 +7,16 @@ Submodules
 mozharness.mozilla.testing.errors module
 ----------------------------------------
 
 .. automodule:: mozharness.mozilla.testing.errors
     :members:
     :undoc-members:
     :show-inheritance:
 
-mozharness.mozilla.testing.mozpool module
------------------------------------------
-
-.. automodule:: mozharness.mozilla.testing.mozpool
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 mozharness.mozilla.testing.talos module
 ---------------------------------------
 
 .. automodule:: mozharness.mozilla.testing.talos
     :members:
     :undoc-members:
     :show-inheritance:
 
--- a/testing/mozharness/mach_commands.py
+++ b/testing/mozharness/mach_commands.py
@@ -42,18 +42,17 @@ class MozharnessRunner(MozbuildObject):
 
         desktop_unittest_config = [
             "--config-file", lambda: self.config_path("unittests",
                                                       "%s_unittest.py" % mozinfo.info['os']),
             "--config-file", lambda: self.config_path("developer_config.py")]
 
         self.config = {
             "__defaults__": {
-                "config": ["--no-read-buildbot-config",
-                           "--download-symbols", "ondemand",
+                "config": ["--download-symbols", "ondemand",
                            "--installer-url", self.installer_url,
                            "--test-packages-url", self.test_packages_url]
             },
 
             "mochitest-valgrind": {
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config + [
                     "--mochitest-suite", "valgrind-plain"]
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -9,17 +9,16 @@
 provides a base class for fx desktop builds
 author: Jordan Lund
 
 """
 import json
 
 import os
 import pprint
-import subprocess
 import time
 import uuid
 import copy
 import glob
 
 # import the power of mozharness ;)
 import sys
 from datetime import datetime
@@ -52,18 +51,17 @@ from mozharness.base.python import (
 AUTOMATION_EXIT_CODES = EXIT_STATUS_DICT.values()
 AUTOMATION_EXIT_CODES.sort()
 
 MISSING_CFG_KEY_MSG = "The key '%s' could not be determined \
 Please add this to your config."
 
 ERROR_MSGS = {
     'undetermined_repo_path': 'The repo could not be determined. \
-Please make sure that either "repo" is in your config or, if \
-you are running this in buildbot, "repo_path" is in your buildbot_config.',
+Please make sure that "repo" is in your config.',
     'comments_undetermined': '"comments" could not be determined. This may be \
 because it was a forced build.',
     'tooltool_manifest_undetermined': '"tooltool_manifest_src" not set, \
 Skipping run_tooltool...',
 }
 
 
 ### Output Parsers
@@ -828,27 +826,20 @@ or run without that action (ie: --no-{ac
         else:
             return None
 
     def query_buildid(self):
         c = self.config
         if self.buildid:
             return self.buildid
 
-        buildid = None
-        if c.get("is_automation") and self.buildbot_config['properties'].get('buildid'):
-            self.info("Determining buildid from buildbot properties")
-            buildid = self.buildbot_config['properties']['buildid'].encode(
-                'ascii', 'replace'
-            )
-        else:
-            # for taskcluster, there are no buildbot properties, and we pass
-            # MOZ_BUILD_DATE into mozharness as an environment variable, only
-            # to have it pass the same value out with the same name.
-            buildid = os.environ.get('MOZ_BUILD_DATE')
+        # for taskcluster, we pass MOZ_BUILD_DATE into mozharness as an
+        # environment variable, only to have it pass the same value out with
+        # the same name.
+        buildid = os.environ.get('MOZ_BUILD_DATE')
 
         if not buildid:
             self.info("Creating buildid through current time")
             buildid = generate_build_ID()
 
         if c.get('is_automation') or os.environ.get("TASK_ID"):
             self.set_buildbot_property('buildid',
                                        buildid,
@@ -1080,42 +1071,30 @@ or run without that action (ie: --no-{ac
             cmd.extend(toolchains.split())
         self.info(str(cmd))
         self.run_command(cmd, cwd=dirs['abs_src_dir'], halt_on_failure=True,
                          env=env)
 
     def query_revision(self, source_path=None):
         """ returns the revision of the build
 
-         first will look for it in buildbot_properties and then in
-         buildbot_config. Failing that, it will actually poll the source of
-         the repo if it exists yet.
-
          This method is used both to figure out what revision to check out and
          to figure out what revision *was* checked out.
         """
         revision = None
-        if 'revision' in self.buildbot_properties:
-            revision = self.buildbot_properties['revision']
-        elif (self.buildbot_config and
-                  self.buildbot_config.get('sourcestamp', {}).get('revision')):
-            revision = self.buildbot_config['sourcestamp']['revision']
-        elif self.buildbot_config and self.buildbot_config.get('revision'):
-            revision = self.buildbot_config['revision']
-        else:
-            if not source_path:
-                dirs = self.query_abs_dirs()
-                source_path = dirs['abs_src_dir']  # let's take the default
+        if not source_path:
+            dirs = self.query_abs_dirs()
+            source_path = dirs['abs_src_dir']  # let's take the default
 
-            # Look at what we have checked out
-            if os.path.exists(source_path):
-                hg = self.query_exe('hg', return_type='list')
-                revision = self.get_output_from_command(
-                    hg + ['parent', '--template', '{node}'], cwd=source_path
-                )
+        # Look at what we have checked out
+        if os.path.exists(source_path):
+            hg = self.query_exe('hg', return_type='list')
+            revision = self.get_output_from_command(
+                hg + ['parent', '--template', '{node}'], cwd=source_path
+            )
         return revision.encode('ascii', 'replace') if revision else None
 
     def _count_ctors(self):
         """count num of ctors and set testresults."""
         dirs = self.query_abs_dirs()
         python_path = os.path.join(dirs['abs_work_dir'], 'venv', 'bin',
                                    'python')
         abs_count_ctors_path = os.path.join(dirs['abs_src_dir'],
@@ -1321,24 +1300,18 @@ or run without that action (ie: --no-{ac
         branch = self.branch
 
         # Building a nightly with the try repository fails because a
         # config-file does not exist for try. Default to mozilla-central
         # settings (arbitrarily).
         if branch == 'try':
             branch = 'mozilla-central'
 
-        # Some android versions share the same .json config - if
-        # multi_locale_config_platform is set, use that the .json name;
-        # otherwise, use the buildbot platform.
-        default_platform = self.buildbot_config['properties'].get('platform',
-                                                                  'android')
-
         multi_config_pf = self.config.get('multi_locale_config_platform',
-                                          default_platform)
+                                          'android')
 
         # The l10n script location differs on buildbot and taskcluster
         if self.config.get('taskcluster_nightly'):
             multil10n_path = \
                 'build/src/testing/mozharness/scripts/multil10n.py'
             base_work_dir = os.path.join(base_work_dir, 'workspace')
         else:
             multil10n_path = '%s/scripts/scripts/multil10n.py' % base_work_dir,
deleted file mode 100644
--- a/testing/mozharness/mozharness/mozilla/testing/mozpool.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env python
-# ***** BEGIN LICENSE BLOCK *****
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-# ***** END LICENSE BLOCK *****
-'''Interact with mozpool/lifeguard/bmm.
-'''
-
-import os
-import socket
-import sys
-
-from time import sleep
-from mozharness.mozilla.buildbot import TBPL_RETRY, TBPL_EXCEPTION
-
-#TODO - adjust these values
-MAX_RETRIES = 20
-RETRY_INTERVAL = 60
-
-# MozpoolMixin {{{1
-class MozpoolMixin(object):
-    mozpool_handler = None
-    mobile_imaging_format= "http://mobile-imaging"
-
-    def determine_mozpool_host(self, device):
-        if "mobile_imaging_format" in self.config:
-            self.mobile_imaging_format = self.config["mobile_imaging_format"]
-        hostname = str(self.mobile_imaging_format)[7:]
-        fqdn = socket.getfqdn(hostname)
-        imaging_server_fqdn = (str(self.mobile_imaging_format)).replace(hostname, fqdn)
-        return imaging_server_fqdn
-
-    def query_mozpool_handler(self, device=None, mozpool_api_url=None):
-        if self.mozpool_handler != None:
-            return self.mozpool_handler
-        else:
-            self.mozpool_api_url = self.determine_mozpool_host(device) if device else mozpool_api_url
-            assert self.mozpool_api_url != None, \
-                "query_mozpool_handler() requires either a device or mozpool_api_url!"
-
-            site_packages_path = self.query_python_site_packages_path()
-            mph_path = os.path.join(site_packages_path, 'mozpoolclient')
-            sys.path.append(mph_path)
-            sys.path.append(site_packages_path)
-            try:
-                from mozpoolclient import MozpoolHandler, MozpoolException, MozpoolConflictException
-                self.MozpoolException = MozpoolException
-                self.MozpoolConflictException = MozpoolConflictException
-                self.mozpool_handler = MozpoolHandler(self.mozpool_api_url, log_obj=self)
-            except ImportError, e:
-                self.fatal("Can't instantiate MozpoolHandler until mozpoolclient python "
-                           "package is installed! (VirtualenvMixin?): \n%s" % str(e))
-            return self.mozpool_handler
-
-    def retrieve_android_device(self, b2gbase):
-        mph = self.query_mozpool_handler(self.mozpool_device)
-        for retry in self._retry_sleep(
-                error_message="INFRA-ERROR: Could not request device '%s'" % self.mozpool_device,
-                tbpl_status=TBPL_RETRY):
-            try:
-                image = 'panda-android-4.0.4_v3.3'
-                duration = 4 * 60 * 60 # request valid for 14400 seconds == 4 hours
-                response = mph.request_device(self.mozpool_device, image, assignee=self.mozpool_assignee, \
-                               b2gbase=b2gbase, pxe_config=None, duration=duration)
-                break
-            except self.MozpoolConflictException:
-                self.warning("Device unavailable. Retry#%i.." % retry)
-            except self.MozpoolException, e:
-                self.buildbot_status(TBPL_RETRY)
-                self.fatal("We could not request the device: %s" % str(e))
-
-        self.request_url = response['request']['url']
-        self.info("Got request, url=%s" % self.request_url)
-        self._wait_for_request_ready()
-
-    def _retry_job_and_close_request(self, message, exception=None):
-        mph = self.query_mozpool_handler(self.mozpool_device)
-        exception_message = str(exception) if exception!=None and str(exception) != None else ""
-        self.error("%s -> %s" % (message, exception_message))
-        if self.request_url:
-            mph.close_request(self.request_url)
-        self.buildbot_status(TBPL_RETRY)
-        self.fatal(message)
-
-    def _retry_sleep(self, sleep_time=RETRY_INTERVAL, max_retries=MAX_RETRIES,
-                     error_message=None, tbpl_status=None, fail_cb=None):
-        for x in range(1, max_retries + 1):
-            yield x
-            sleep(sleep_time)
-        if error_message:
-            self.error(error_message)
-        if tbpl_status:
-            self.buildbot_status(tbpl_status)
-        if fail_cb:
-            assert callable(fail_cb)
-            fail_cb()
-        self.fatal('Retries limit exceeded')
-
-    def _wait_for_request_ready(self):
-        mph = self.query_mozpool_handler(self.mozpool_device)
-        def on_fail():
-            # Device is not ready after retries...
-            self.info("Aborting mozpool request.")
-            self.close_request()
-        for retry in self._retry_sleep(sleep_time=RETRY_INTERVAL, max_retries=MAX_RETRIES,
-                error_message="INFRA-ERROR: Request did not become ready in time",
-                tbpl_status=TBPL_EXCEPTION, fail_cb=on_fail):
-            response = mph.query_request_status(self.request_url)
-            state = response['state']
-            if state == 'ready':
-                return
-            self.info("Waiting for request 'ready' stage.  Current state: '%s'" % state)
--- a/testing/mozharness/mozharness/mozilla/testing/raptor.py
+++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py
@@ -61,17 +61,16 @@ class Raptor(TestingMixin, MercurialScri
           "help": "extra options to raptor"
           }],
     ] + testing_config_options + copy.deepcopy(blobupload_config_options) \
                                + copy.deepcopy(code_coverage_config_options)
 
     def __init__(self, **kwargs):
         kwargs.setdefault('config_options', self.config_options)
         kwargs.setdefault('all_actions', ['clobber',
-                                          'read-buildbot-config',
                                           'download-and-extract',
                                           'populate-webroot',
                                           'create-virtualenv',
                                           'install',
                                           'run-tests',
                                           ])
         kwargs.setdefault('default_actions', ['clobber',
                                               'download-and-extract',
@@ -204,17 +203,16 @@ class Raptor(TestingMixin, MercurialScri
                     else:
                         self.fatal("Test name not provided")
         else:
             # raptor initiated in production via mozharness
             self.test = self.config['test']
 
     # Action methods. {{{1
     # clobber defined in BaseScript
-    # read_buildbot_config defined in BuildbotMixin
 
     def download_and_extract(self, extract_dirs=None, suite_categories=None):
         return super(Raptor, self).download_and_extract(
             suite_categories=['common', 'raptor']
         )
 
     def create_virtualenv(self, **kwargs):
         """VirtualenvMixin.create_virtualenv() assuemes we're using
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -156,17 +156,16 @@ class Talos(TestingMixin, MercurialScrip
             "help": "Tries to enable the WebRender compositor.",
         }],
     ] + testing_config_options + copy.deepcopy(blobupload_config_options) \
                                + copy.deepcopy(code_coverage_config_options)
 
     def __init__(self, **kwargs):
         kwargs.setdefault('config_options', self.config_options)
         kwargs.setdefault('all_actions', ['clobber',
-                                          'read-buildbot-config',
                                           'download-and-extract',
                                           'populate-webroot',
                                           'create-virtualenv',
                                           'install',
                                           'setup-mitmproxy',
                                           'run-tests',
                                           ])
         kwargs.setdefault('default_actions', ['clobber',
@@ -199,44 +198,16 @@ class Talos(TestingMixin, MercurialScrip
         self.mitmproxy_recordings_file_list = self.config.get('mitmproxy', None) # files inside the recording set
         self.mitmdump = None # path to mitdump tool itself, in py3 venv
 
     # We accept some configuration options from the try commit message in the format mozharness: <options>
     # Example try commit message:
     #   mozharness: --geckoProfile try: <stuff>
     def query_gecko_profile_options(self):
         gecko_results = []
-        if self.buildbot_config:
-            # this is inside automation
-            # now let's see if we added GeckoProfile specs in the commit message
-            try:
-                junk, junk, opts = self.buildbot_config['sourcestamp']['changes'][-1]['comments'].partition('mozharness:')
-            except IndexError:
-                # when we don't have comments on changes (bug 1255187)
-                opts = None
-
-            if opts:
-                # In the case of a multi-line commit message, only examine
-                # the first line for mozharness options
-                opts = opts.split('\n')[0]
-                opts = re.sub(r'\w+:.*', '', opts).strip().split(' ')
-                if "--geckoProfile" in opts:
-                    # overwrite whatever was set here.
-                    self.gecko_profile = True
-                try:
-                    idx = opts.index('--geckoProfileInterval')
-                    if len(opts) > idx + 1:
-                        self.gecko_profile_interval = opts[idx + 1]
-                except ValueError:
-                    pass
-            else:
-                # no opts, check for '--geckoProfile' in try message text directly
-                if self.try_message_has_flag('geckoProfile'):
-                    self.gecko_profile = True
-
         # finally, if gecko_profile is set, we add that to the talos options
         if self.gecko_profile:
             gecko_results.append('--geckoProfile')
             if self.gecko_profile_interval:
                 gecko_results.extend(
                     ['--geckoProfileInterval', str(self.gecko_profile_interval)]
                 )
         return gecko_results
@@ -573,17 +544,16 @@ class Talos(TestingMixin, MercurialScrip
         )
         archive = os.path.join(dest, self.mitmproxy_recording_set)
         unzip = self.query_exe('unzip')
         unzip_cmd = [unzip, '-q', '-o', archive, '-d', dest]
         self.run_command(unzip_cmd, halt_on_failure=True)
 
     # Action methods. {{{1
     # clobber defined in BaseScript
-    # read_buildbot_config defined in BuildbotMixin
 
     def download_and_extract(self, extract_dirs=None, suite_categories=None):
         return super(Talos, self).download_and_extract(
             suite_categories=['common', 'talos']
         )
 
     def create_virtualenv(self, **kwargs):
         """VirtualenvMixin.create_virtualenv() assuemes we're using
@@ -702,25 +672,16 @@ class Talos(TestingMixin, MercurialScrip
 
         if self.config['enable_webrender']:
             env['MOZ_WEBRENDER'] = '1'
             env['MOZ_ACCELERATED'] = '1'
 
         # TODO: consider getting rid of this as we should be default to stylo now
         env['STYLO_FORCE_ENABLED'] = '1'
 
-        # Remove once Talos is migrated away from buildbot
-        if self.buildbot_config:
-            platform = self.buildbot_config.get('properties', {}).get('platform', '')
-            if 'qr' in platform:
-                env['MOZ_WEBRENDER'] = '1'
-                env['MOZ_ACCELERATED'] = '1'
-            if 'styloseq' in platform:
-                env['STYLO_THREADS'] = '1'
-
         # sets a timeout for how long talos should run without output
         output_timeout = self.config.get('talos_output_timeout', 3600)
         # run talos tests
         run_tests = os.path.join(self.talos_path, 'talos', 'run_tests.py')
 
         mozlog_opts = ['--log-tbpl-level=debug']
         if not self.run_local and 'suite' in self.config:
             fname_pattern = '%s_%%s.log' % self.config['suite']
--- a/testing/mozharness/mozharness/mozilla/testing/testbase.py
+++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py
@@ -200,28 +200,23 @@ class TestingMixin(VirtualenvMixin, Buil
                 self._developer_mode_changes(rw_config)
 
     def _developer_mode_changes(self, rw_config):
         """ This function is called when you append the config called
             developer_config.py. This allows you to run a job
             outside of the Release Engineering infrastructure.
 
             What this functions accomplishes is:
-            * read-buildbot-config is removed from the list of actions
             * --installer-url is set
             * --test-url is set if needed
             * every url is substituted by another external to the
                 Release Engineering network
         """
         c = self.config
         orig_config = copy.deepcopy(c)
-        self.warning("When you use developer_config.py, we drop "
-                "'read-buildbot-config' from the list of actions.")
-        if "read-buildbot-config" in rw_config.actions:
-            rw_config.actions.remove("read-buildbot-config")
         self.actions = tuple(rw_config.actions)
 
         def _replace_url(url, changes):
             for from_, to_ in changes:
                 if url.startswith(from_):
                     new_url = url.replace(from_, to_)
                     self.info("Replacing url %s -> %s" % (url, new_url))
                     return new_url
@@ -271,120 +266,31 @@ class TestingMixin(VirtualenvMixin, Buil
 
         # If we have the developer_run flag enabled then we will switch
         # URLs to the right place and enable http authentication
         if "developer_config.py" in self.config["config_files"]:
             return _urlopen_basic_auth(url, **kwargs)
         else:
             return urllib2.urlopen(url, **kwargs)
 
-    # read_buildbot_config is in BuildbotMixin.
-
-    def find_artifacts_from_buildbot_changes(self):
-        c = self.config
-        try:
-            files = self.buildbot_config['sourcestamp']['changes'][-1]['files']
-            buildbot_prop_branch = self.buildbot_config['properties']['branch']
-
-            # Bug 868490 - Only require exactly two files if require_test_zip;
-            # otherwise accept either 1 or 2, since we'll be getting a
-            # test_zip url that we don't need.
-            expected_length = [1, 2, 3]
-            if c.get("require_test_zip") and not self.test_url:
-                expected_length = [2, 3]
-            actual_length = len(files)
-            if actual_length not in expected_length:
-                self.fatal("Unexpected number of files in buildbot config %s.\nExpected these number(s) of files: %s, but got: %d" %
-                           (c['buildbot_json_path'], str(expected_length), actual_length))
-            for f in files:
-                if f['name'].endswith('tests.zip'):  # yuk
-                    if not self.test_url:
-                        # str() because of unicode issues on mac
-                        self.test_url = str(f['name'])
-                        self.info("Found test url %s." % self.test_url)
-                elif f['name'].endswith('crashreporter-symbols.zip'):  # yuk
-                    self.symbols_url = str(f['name'])
-                    self.info("Found symbols url %s." % self.symbols_url)
-                elif f['name'].endswith('test_packages.json'):
-                    self.test_packages_url = str(f['name'])
-                    self.info("Found a test packages url %s." % self.test_packages_url)
-                elif not any(f['name'].endswith(s) for s in ('code-coverage-gcno.zip', 'stylo-bindings.zip')):
-                    if not self.installer_url:
-                        self.installer_url = str(f['name'])
-                        self.info("Found installer url %s." % self.installer_url)
-        except IndexError, e:
-            self.error(str(e))
-
-    def find_artifacts_from_taskcluster(self):
-        self.info("Finding installer, test and symbols from parent task. ")
-        task_id = self.buildbot_config['properties']['taskId']
-        self.set_parent_artifacts(task_id)
-
-    def postflight_read_buildbot_config(self):
-        """
-        Determine which files to download from the buildprops.json file
-        created via the buildbot ScriptFactory.
-        """
-        if self.buildbot_config:
-            c = self.config
-            message = "Unable to set %s from the buildbot config"
-            if c.get("installer_url"):
-                self.installer_url = c['installer_url']
-            if c.get("test_url"):
-                self.test_url = c['test_url']
-            if c.get("test_packages_url"):
-                self.test_packages_url = c['test_packages_url']
-
-            # This supports original Buildbot to Buildbot mode
-            if self.buildbot_config['sourcestamp']['changes']:
-                self.find_artifacts_from_buildbot_changes()
-
-            # This supports TaskCluster/BBB task to Buildbot job
-            elif 'testPackagesUrl' in self.buildbot_config['properties'] and \
-                 'packageUrl' in self.buildbot_config['properties']:
-                self.installer_url = self.buildbot_config['properties']['packageUrl']
-                self.test_packages_url = self.buildbot_config['properties']['testPackagesUrl']
-
-            # This supports TaskCluster/BBB task to TaskCluster/BBB task
-            elif 'taskId' in self.buildbot_config['properties']:
-                self.find_artifacts_from_taskcluster()
-
-            missing = []
-            if not self.installer_url:
-                missing.append("installer_url")
-            if c.get("require_test_zip") and not self.test_url and not self.test_packages_url:
-                missing.append("test_url")
-            if missing:
-                self.fatal("%s!" % (message % ('+'.join(missing))))
-        else:
-            self.fatal("self.buildbot_config isn't set after running read_buildbot_config!")
-
     def _query_binary_version(self, regex, cmd):
         output = self.get_output_from_command(cmd, silent=False)
         return regex.search(output).group(0)
 
     def preflight_download_and_extract(self):
         message = ""
         if not self.installer_url:
             message += """installer_url isn't set!
 
-You can set this by:
-
-1. specifying --installer-url URL, or
-2. running via buildbot and running the read-buildbot-config action
-
+You can set this by specifying --installer-url URL
 """
         if self.config.get("require_test_zip") and not self.test_url and not self.test_packages_url:
             message += """test_url isn't set!
 
-You can set this by:
-
-1. specifying --test-url URL, or
-2. running via buildbot and running the read-buildbot-config action
-
+You can set this by specifying --test-url URL
 """
         if message:
             self.fatal(message + "Can't run download-and-extract... exiting")
 
     def _read_packages_manifest(self):
         dirs = self.query_abs_dirs()
         source = self.download_file(self.test_packages_url,
                                     parent_dir=dirs['abs_work_dir'],
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -53,17 +53,16 @@ class AndroidEmulatorTest(TestingMixin, 
     ]] + copy.deepcopy(testing_config_options)
 
     app_name = None
 
     def __init__(self, require_config_file=False):
         super(AndroidEmulatorTest, self).__init__(
             config_options=self.config_options,
             all_actions=['clobber',
-                         'read-buildbot-config',
                          'setup-avds',
                          'start-emulator',
                          'download-and-extract',
                          'create-virtualenv',
                          'verify-emulator',
                          'install',
                          'run-tests',
                          ],
deleted file mode 100755
--- a/testing/mozharness/scripts/bouncer_submitter.py
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env python
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import os
-import sys
-
-sys.path.insert(1, os.path.dirname(sys.path[0]))
-
-from mozharness.base.script import BaseScript
-from mozharness.mozilla.bouncer.submitter import BouncerSubmitterMixin
-from mozharness.mozilla.buildbot import BuildbotMixin
-from mozharness.mozilla.purge import PurgeMixin
-
-
-class BouncerSubmitter(BaseScript, PurgeMixin, BouncerSubmitterMixin, BuildbotMixin):
-    config_options = [
-        [["--repo"], {
-            "dest": "repo",
-            "help": "Specify source repo, e.g. releases/mozilla-beta",
-        }],
-        [["--revision"], {
-            "dest": "revision",
-            "help": "Source revision/tag used to fetch shipped-locales",
-        }],
-        [["--version"], {
-            "dest": "version",
-            "help": "Current version",
-        }],
-        [["--previous-version"], {
-            "dest": "prev_versions",
-            "action": "extend",
-            "help": "Previous version(s)",
-        }],
-        [["--build-number"], {
-            "dest": "build_number",
-            "help": "Build number of version",
-        }],
-        [["--bouncer-api-prefix"], {
-            "dest": "bouncer-api-prefix",
-            "help": "Bouncer admin API URL prefix",
-        }],
-        [["--credentials-file"], {
-            "dest": "credentials_file",
-            "help": "File containing Bouncer credentials",
-        }],
-    ]
-
-    def __init__(self, require_config_file=True):
-        BaseScript.__init__(self,
-                            config_options=self.config_options,
-                            require_config_file=require_config_file,
-                            # other stuff
-                            all_actions=[
-                                'clobber',
-                                'download-shipped-locales',
-                                'submit',
-                            ],
-                            default_actions=[
-                                'clobber',
-                                'download-shipped-locales',
-                                'submit',
-                            ],
-                            config={
-                                 'buildbot_json_path': 'buildprops.json'
-                            }
-                            )
-        self.locales = None
-        self.credentials = None
-
-    def _pre_config_lock(self, rw_config):
-        super(BouncerSubmitter, self)._pre_config_lock(rw_config)
-
-        # override properties from buildbot properties here as defined by taskcluster properties
-        self.read_buildbot_config()
-
-        # check if release promotion is true first before overwriting these properties
-        if self.buildbot_config["properties"].get("release_promotion"):
-            for prop in \
-                    ['product', 'version', 'build_number', 'revision',
-                     'bouncer_submitter_config', ]:
-                if self.buildbot_config["properties"].get(prop):
-                    self.info("Overriding %s with %s" %
-                              (prop,  self.buildbot_config["properties"].get(prop)))
-                    self.config[prop] = self.buildbot_config["properties"].get(prop)
-            if self.buildbot_config["properties"].get("partial_versions"):
-                self.config["prev_versions"] = \
-                    self.buildbot_config["properties"].get("partial_versions").split(", ")
-
-        for opt in ["version", "credentials_file", "bouncer-api-prefix"]:
-            if opt not in self.config:
-                self.fatal("%s must be specified" % opt)
-        if self.need_shipped_locales():
-            for opt in ["shipped-locales-url", "repo", "revision"]:
-                if opt not in self.config:
-                    self.fatal("%s must be specified" % opt)
-
-    def need_shipped_locales(self):
-        return any(e.get("add-locales") for e in
-                   self.config["products"].values())
-
-    def query_shipped_locales_path(self):
-        dirs = self.query_abs_dirs()
-        return os.path.join(dirs["abs_work_dir"], "shipped-locales")
-
-    def download_shipped_locales(self):
-        if not self.need_shipped_locales():
-            self.info("No need to download shipped-locales")
-            return
-
-        replace_dict = {"revision": self.config["revision"],
-                        "repo": self.config["repo"]}
-        url = self.config["shipped-locales-url"] % replace_dict
-        dirs = self.query_abs_dirs()
-        self.mkdir_p(dirs["abs_work_dir"])
-        if not self.download_file(url=url,
-                                  file_name=self.query_shipped_locales_path()):
-            self.fatal("Unable to fetch shipped-locales from %s" % url)
-        # populate the list
-        self.load_shipped_locales()
-
-    def load_shipped_locales(self):
-        if self.locales:
-            return self.locales
-        content = self.read_from_file(self.query_shipped_locales_path())
-        locales = []
-        for line in content.splitlines():
-            locale = line.split()[0]
-            if locale:
-                locales.append(locale)
-        self.locales = locales
-        return self.locales
-
-    def submit(self):
-        subs = {
-            "version": self.config["version"]
-        }
-        if self.config.get("build_number"):
-            subs["build_number"] = self.config["build_number"]
-
-        for product, pr_config in sorted(self.config["products"].items()):
-            product_name = pr_config["product-name"] % subs
-            if self.product_exists(product_name):
-                self.warning("Product %s already exists. Skipping..." %
-                             product_name)
-                continue
-            self.info("Adding %s..." % product)
-            self.api_add_product(
-                product_name=product_name,
-                add_locales=pr_config.get("add-locales"),
-                ssl_only=pr_config.get("ssl-only"))
-            self.info("Adding paths...")
-            for platform, pl_config in sorted(pr_config["paths"].items()):
-                bouncer_platform = pl_config["bouncer-platform"]
-                path = pl_config["path"] % subs
-                self.info("%s (%s): %s" % (platform, bouncer_platform, path))
-                self.api_add_location(product_name, bouncer_platform, path)
-
-        # Add partial updates
-        if "partials" in self.config and self.config.get("prev_versions"):
-            self.submit_partials()
-
-    def submit_partials(self):
-        subs = {
-            "version": self.config["version"]
-        }
-        if self.config.get("build_number"):
-            subs["build_number"] = self.config["build_number"]
-        prev_versions = self.config.get("prev_versions")
-        for product, part_config in sorted(self.config["partials"].items()):
-            product_name_tmpl = part_config["product-name"]
-            for prev_version in prev_versions:
-                prev_version, prev_build_number = prev_version.split("build")
-                subs["prev_version"] = prev_version
-                subs["prev_build_number"] = prev_build_number
-                product_name = product_name_tmpl % subs
-                if self.product_exists(product_name):
-                    self.warning("Product %s already exists. Skipping..." %
-                                 product_name)
-                    continue
-                self.info("Adding partial updates for %s" % product_name)
-                self.api_add_product(
-                    product_name=product_name,
-                    add_locales=part_config.get("add-locales"),
-                    ssl_only=part_config.get("ssl-only"))
-                for platform, pl_config in sorted(part_config["paths"].items()):
-                    bouncer_platform = pl_config["bouncer-platform"]
-                    path = pl_config["path"] % subs
-                    self.info("%s (%s): %s" % (platform, bouncer_platform, path))
-                    self.api_add_location(product_name, bouncer_platform, path)
-
-
-if __name__ == '__main__':
-    myScript = BouncerSubmitter()
-    myScript.run_and_exit()
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -187,17 +187,16 @@ class DesktopUnittest(TestingMixin, Merc
 
     def __init__(self, require_config_file=True):
         # abs_dirs defined already in BaseScript but is here to make pylint happy
         self.abs_dirs = None
         super(DesktopUnittest, self).__init__(
             config_options=self.config_options,
             all_actions=[
                 'clobber',
-                'read-buildbot-config',
                 'download-and-extract',
                 'create-virtualenv',
                 'install',
                 'stage-files',
                 'run-tests',
             ],
             require_config_file=require_config_file,
             config={'require_test_zip': True})
@@ -532,18 +531,16 @@ class DesktopUnittest(TestingMixin, Merc
         if not self.structured_output(suite_category, flavor):
             return DesktopUnittestOutputParser(suite_category=suite_category, **kwargs)
         self.info("Structured output parser in use for %s." % suite_category)
         return StructuredOutputParser(suite_category=suite_category, strict=strict, **kwargs)
 
     # Actions {{{2
 
     # clobber defined in BaseScript, deletes mozharness/build if exists
-    # read_buildbot_config is in BuildbotMixin.
-    # postflight_read_buildbot_config is in TestingMixin.
     # preflight_download_and_extract is in TestingMixin.
     # create_virtualenv is in VirtualenvMixin.
     # preflight_install is in TestingMixin.
     # install is in TestingMixin.
     # upload_blobber_files is in BlobUploadMixin
 
     @PreScriptAction('download-and-extract')
     def _pre_download_and_extract(self, action):
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@@ -85,35 +85,19 @@ class FxDesktopBuild(BuildScript, TryToo
                 #
 
             },
             'ConfigClass': BuildingConfig,
         }
         super(FxDesktopBuild, self).__init__(**buildscript_kwargs)
 
     def _pre_config_lock(self, rw_config):
-        """grab buildbot props if we are running this in automation"""
+        """grab properties if we are running this in automation"""
         super(FxDesktopBuild, self)._pre_config_lock(rw_config)
         c = self.config
-        if c['is_automation']:
-            # parse buildbot config and add it to self.config
-            self.info("We are running this in buildbot, grab the build props")
-            self.read_buildbot_config()
-            ###
-            if c.get('stage_platform'):
-                platform_for_log_url = c['stage_platform']
-                if c.get('pgo_build'):
-                    platform_for_log_url += '-pgo'
-                # postrun.py uses stage_platform buildbot prop as part of the log url
-                self.set_buildbot_property('stage_platform',
-                                           platform_for_log_url,
-                                           write_to_file=True)
-            else:
-                self.fatal("'stage_platform' not determined and is required in your config")
-
         if self.try_message_has_flag('artifact') or os.environ.get('USE_ARTIFACT'):
             # Not all jobs that look like builds can be made into artifact
             # builds (for example, various SAN builds will not make sense as
             # artifact builds).  By default, only a vanilla debug or opt build
             # will be replaced by an artifact build.
             #
             # In addition, some jobs want to specify their artifact equivalent.
             # Use `artifact_flag_build_variant_in_try` to specify that variant.
@@ -218,17 +202,16 @@ class FxDesktopBuild(BuildScript, TryToo
                                         self._query_objdir())
             },
         }
         abs_dirs.update(dirs)
         self.abs_dirs = abs_dirs
         return self.abs_dirs
 
         # Actions {{{2
-        # read_buildbot_config in BuildingMixin
         # clobber in BuildingMixin -> PurgeMixin
 
     def set_extra_try_arguments(self, action, success=None):
         """ Override unneeded method from TryToolsMixin """
         pass
 
     @script.PreScriptRun
     def suppress_windows_modal_dialogs(self, *args, **kwargs):
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -119,17 +119,16 @@ class MarionetteTest(TestingMixin, Mercu
         + copy.deepcopy(code_coverage_config_options)
 
     repos = []
 
     def __init__(self, require_config_file=False):
         super(MarionetteTest, self).__init__(
             config_options=self.config_options,
             all_actions=['clobber',
-                         'read-buildbot-config',
                          'pull',
                          'download-and-extract',
                          'create-virtualenv',
                          'install',
                          'run-tests'],
             default_actions=['clobber',
                              'pull',
                              'download-and-extract',
deleted file mode 100644
--- a/testing/mozharness/scripts/release/publish_balrog.py
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env python
-# lint_ignore=E501
-# ***** BEGIN LICENSE BLOCK *****
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-# ***** END LICENSE BLOCK *****
-""" updates.py
-
-A script publish a release to Balrog.
-
-"""
-
-import os
-import sys
-from datetime import datetime, timedelta
-
-sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
-from mozharness.base.vcs.vcsbase import MercurialScript
-from mozharness.mozilla.buildbot import BuildbotMixin
-from mozharness.base.log import FATAL
-
-# PublishBalrog {{{1
-
-
-class PublishBalrog(MercurialScript, BuildbotMixin):
-
-    def __init__(self, require_config_file=True):
-        super(PublishBalrog, self).__init__(
-            all_actions=[
-                'clobber',
-                'pull',
-                'submit-to-balrog',
-            ],
-            default_actions=[
-                'clobber',
-                'pull',
-                'submit-to-balrog',
-            ],
-            config={
-                'buildbot_json_path': 'buildprops.json',
-                'credentials_file': 'oauth.txt',
-            },
-            require_config_file=require_config_file
-        )
-
-    def _pre_config_lock(self, rw_config):
-        super(PublishBalrog, self)._pre_config_lock(rw_config)
-        # override properties from buildbot properties here as defined by
-        # taskcluster properties
-        self.read_buildbot_config()
-        if not self.buildbot_config:
-            self.warning("Skipping buildbot properties overrides")
-            return
-        # TODO: version and appVersion should come from repo
-        props = self.buildbot_config["properties"]
-        for prop in ['product', 'version', 'build_number', 'channels',
-                     'balrog_api_root', 'schedule_at', 'background_rate',
-                     'publish_bz2_blob']:
-            if props.get(prop):
-                self.info("Overriding %s with %s" % (prop, props[prop]))
-                self.config[prop] = props.get(prop)
-
-    def query_abs_dirs(self):
-        if self.abs_dirs:
-            return self.abs_dirs
-        self.abs_dirs = super(PublishBalrog, self).query_abs_dirs()
-        self.abs_dirs["abs_tools_dir"] = os.path.join(
-            self.abs_dirs['abs_work_dir'], self.config["repo"]["dest"])
-        return self.abs_dirs
-
-    def query_channel_configs(self):
-        """Return a list of channel configs.
-        For RC builds it returns "release" and "beta" using
-        "enabled_if_version_matches" to match RC.
-
-        :return: list
-         """
-        return [(n, c) for n, c in self.config["update_channels"].items() if
-                n in self.config["channels"]]
-
-    def query_repos(self):
-        """Build a list of repos to clone."""
-        return [self.config["repo"]]
-
-    def pull(self):
-        super(PublishBalrog, self).pull(
-            repos=self.query_repos())
-
-    def submit_to_balrog(self):
-        for _, channel_config in self.query_channel_configs():
-            self._submit_to_balrog(channel_config)
-        if 'publish_bz2_blob' in self.config and \
-                self.config['publish_bz2_blob']:
-            for _, channel_config in self.query_channel_configs():
-                self._submit_to_balrog_bz2(channel_config)
-
-    def _submit_to_balrog(self, channel_config):
-        dirs = self.query_abs_dirs()
-        auth = os.path.join(os.getcwd(), self.config['credentials_file'])
-        cmd = [
-            sys.executable,
-            os.path.join(dirs["abs_tools_dir"],
-                         "scripts/build-promotion/balrog-release-shipper.py")]
-        cmd.extend([
-            "--api-root", self.config["balrog_api_root"],
-            "--credentials-file", auth,
-            "--username", self.config["balrog_username"],
-            "--version", self.config["version"],
-            "--product", self.config["product"],
-            "--build-number", str(self.config["build_number"]),
-            "--verbose",
-        ])
-        for r in channel_config["publish_rules"]:
-            cmd.extend(["--rules", str(r)])
-        if channel_config.get("schedule_asap"):
-            # RC releases going to the beta channel have no ETA set for the
-            # RC-to-beta push. The corresponding task is scheduled after we
-            # resolve the push-to-beta human decision task, so we can schedule
-            # it ASAP plus some additional 30m to avoid retry() to fail.
-            schedule_at = datetime.utcnow() + timedelta(minutes=30)
-            cmd.extend(["--schedule-at", schedule_at.isoformat()])
-        elif self.config.get("schedule_at"):
-            cmd.extend(["--schedule-at", self.config["schedule_at"]])
-        if self.config.get("background_rate"):
-            cmd.extend(["--background-rate", str(self.config["background_rate"])])
-
-        self.retry(lambda: self.run_command(cmd, halt_on_failure=True),
-                   error_level=FATAL)
-
-    def _submit_to_balrog_bz2(self, channel_config):
-        if "bz2_blob_suffix" not in channel_config:
-            self.info("No need to generate BZ2 blob")
-            return
-
-        dirs = self.query_abs_dirs()
-        # Use env varialbe instead of command line to avoid issues with blob
-        # names starting with "-", e.g. "-bz2"
-        env = {"BALROG_BLOB_SUFFIX": channel_config["bz2_blob_suffix"]}
-        auth = os.path.join(os.getcwd(), self.config['credentials_file'])
-        cmd = [
-            sys.executable,
-            os.path.join(dirs["abs_tools_dir"],
-                         "scripts/build-promotion/balrog-release-shipper.py")]
-        cmd.extend([
-            "--api-root", self.config["balrog_api_root"],
-            "--credentials-file", auth,
-            "--username", self.config["balrog_username"],
-            "--version", self.config["version"],
-            "--product", self.config["product"],
-            "--build-number", str(self.config["build_number"]),
-            "--verbose",
-        ])
-        for r in channel_config["bz2_publish_rules"]:
-            cmd.extend(["--rules", str(r)])
-        if channel_config.get("schedule_asap"):
-            # RC releases going to the beta channel have no ETA set for the
-            # RC-to-beta push. The corresponding task is scheduled after we
-            # resolve the push-to-beta human decision task, so we can schedule
-            # it ASAP plus some additional 30m to avoid retry() to fail.
-            schedule_at = datetime.utcnow() + timedelta(minutes=30)
-            cmd.extend(["--schedule-at", schedule_at.isoformat()])
-        elif self.config.get("schedule_at"):
-            cmd.extend(["--schedule-at", self.config["schedule_at"]])
-        if self.config.get("background_rate"):
-            cmd.extend(["--background-rate", str(self.config["background_rate"])])
-
-        self.retry(lambda: self.run_command(cmd, halt_on_failure=True, env=env),
-                   error_level=FATAL)
-
-
-# __main__ {{{1
-if __name__ == '__main__':
-    PublishBalrog().run_and_exit()
--- a/testing/mozharness/scripts/release/updates.py
+++ b/testing/mozharness/scripts/release/updates.py
@@ -78,40 +78,16 @@ class UpdatesBumper(MercurialScript, Bui
             ],
             config={
                 'buildbot_json_path': 'buildprops.json',
                 'credentials_file': 'oauth.txt',
             },
             require_config_file=require_config_file
         )
 
-    def _pre_config_lock(self, rw_config):
-        super(UpdatesBumper, self)._pre_config_lock(rw_config)
-        # override properties from buildbot properties here as defined by
-        # taskcluster properties
-        self.read_buildbot_config()
-        if not self.buildbot_config:
-            self.warning("Skipping buildbot properties overrides")
-            return
-        # TODO: version and appVersion should come from repo
-        props = self.buildbot_config["properties"]
-        for prop in ['product', 'version', 'build_number', 'revision',
-                     'appVersion', 'balrog_api_root', "channels",
-                     'generate_bz2_blob', 'updater_platform']:
-            if props.get(prop):
-                self.info("Overriding %s with %s" % (prop, props[prop]))
-                self.config[prop] = props.get(prop)
-
-        partials = [v.strip() for v in props["partial_versions"].split(",")]
-        self.config["partial_versions"] = [v.split("build") for v in partials]
-        self.config["platforms"] = [p.strip() for p in
-                                    props["platforms"].split(",")]
-        self.config["channels"] = [c.strip() for c in
-                                   props["channels"].split(",")]
-
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         self.abs_dirs = super(UpdatesBumper, self).query_abs_dirs()
         self.abs_dirs["abs_tools_dir"] = os.path.join(
             self.abs_dirs['abs_work_dir'], self.config["repo"]["dest"])
         return self.abs_dirs
 
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -92,17 +92,16 @@ class WebPlatformTest(TestingMixin, Merc
         copy.deepcopy(blobupload_config_options) + \
         copy.deepcopy(code_coverage_config_options)
 
     def __init__(self, require_config_file=True):
         super(WebPlatformTest, self).__init__(
             config_options=self.config_options,
             all_actions=[
                 'clobber',
-                'read-buildbot-config',
                 'download-and-extract',
                 'create-virtualenv',
                 'pull',
                 'install',
                 'run-tests',
             ],
             require_config_file=require_config_file,
             config={'require_test_zip': True})
--- a/testing/mozharness/unit.sh
+++ b/testing/mozharness/unit.sh
@@ -45,17 +45,17 @@ if [ $OS_TYPE == 'windows' ] ; then
     fi
   done
 else
   SCRIPTS_PY_FILES=$files
 fi
 export PYTHONPATH=`env pwd`:$PYTHONPATH
 
 echo "### Running pyflakes"
-pyflakes $MOZHARNESS_PY_FILES $SCRIPTS_PY_FILES | grep -v "local variable 'url' is assigned to" | grep -v "redefinition of unused 'json'" | egrep -v "mozharness/mozilla/testing/mozpool\.py.*undefined name 'requests'"
+pyflakes $MOZHARNESS_PY_FILES $SCRIPTS_PY_FILES | grep -v "local variable 'url' is assigned to" | grep -v "redefinition of unused 'json'"
 
 echo "### Running pylint"
 pylint -E -e F -f parseable $MOZHARNESS_PY_FILES $SCRIPTS_PY_FILES 2>&1 | egrep -v '(No config file found, using default configuration|Instance of .* has no .* member|Unable to import .devicemanager|Undefined variable .DMError|Module .hashlib. has no .sha512. member)'
 
 rm -rf build logs
 if [ $OS_TYPE != 'windows' ] ; then
   echo "### Testing non-networked unit tests"
   coverage run -a --branch $COVERAGE_ARGS $NOSETESTS test/test_*.py