Bug 1237182: Removing unused buildbot support r=Callek

MozReview-Commit-ID: EjclZgc864L

--HG--
extra : rebase_source : aebc03899ad88aa2838825c14a45c59e1e59be05
extra : source : ba91fec47e908619d9a8f550ee65cd78f67e3d59

taskcluster/ci/test/compiled.yml

@@ -1,7 +1,6 @@
 job-defaults:
     e10s: false
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py

taskcluster/ci/test/marionette.yml

@@ -1,7 +1,6 @@
 job-defaults:
     suite: marionette
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py

taskcluster/ci/test/misc.yml

@@ -8,7 +8,6 @@ geckoview:
     target: geckoview_example.apk
     mozharness:
         script: android_emulator_unittest.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 android-4.2-x86/opt:
@@ -38,7 +37,6 @@ geckoview-junit:
             default: 1
     mozharness:
         script: android_emulator_unittest.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 android-4.2-x86/opt:
@@ -66,7 +64,6 @@ robocop:
     e10s: false
     mozharness:
         script: android_emulator_unittest.py
-        no-read-buildbot-config: true
         config:
             - android/android_common.py
             - android/androidarm_4_3.py
@@ -127,7 +124,6 @@ test-verify:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
-        no-read-buildbot-config: true
         extra-options:
             - --verify
 
@@ -171,7 +167,6 @@ test-verify-gpu:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
-        no-read-buildbot-config: true
         extra-options:
             - --verify
             - --gpu-required
@@ -211,6 +206,5 @@ test-coverage:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
-        no-read-buildbot-config: true
         extra-options:
             - --per-test-coverage

taskcluster/ci/test/mochitest.yml

@@ -4,7 +4,6 @@ job-defaults:
             android-7.0-x86/opt: geckoview-androidTest.apk
             default: null
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py

taskcluster/ci/test/raptor.yml

@@ -12,7 +12,6 @@ job-defaults:
             default: hardware
     mozharness:
         script: raptor_script.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:

taskcluster/ci/test/reftest.yml

@@ -4,7 +4,6 @@ job-defaults:
             android-7.0-x86/opt: geckoview-androidTest.apk
             default: null
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py

taskcluster/ci/test/talos.yml

@@ -12,7 +12,6 @@ job-defaults:
             default: hardware
     mozharness:
         script: talos_script.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:

taskcluster/ci/test/web-platform.yml

@@ -3,7 +3,6 @@ job-defaults:
     max-run-time: 5400
     mozharness:
         script: web_platform_tests.py
-        no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:

taskcluster/ci/test/xpcshell.yml

@@ -1,6 +1,5 @@
 job-defaults:
     mozharness:
-        no-read-buildbot-config: true
         script:
             by-test-platform:
                 android.*: android_emulator_unittest.py

taskcluster/taskgraph/transforms/job/mozharness_test.py

@@ -181,8 +181,6 @@ def mozharness_test_on_docker(config, job, taskdesc):
         '/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)},
@@ -291,8 +289,6 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
             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'):
@@ -397,8 +393,6 @@ def mozharness_test_on_native_engine(config, job, taskdesc):
     )
 
     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)},

taskcluster/taskgraph/transforms/tests.py

@@ -283,10 +283,6 @@ test_description_schema = Schema({
         # 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,
 
@@ -449,7 +445,6 @@ def set_defaults(config, tests):
         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')

testing/mozharness/configs/android/android_common.py

@@ -8,7 +8,6 @@ import os
 config = {
     "default_actions": [
         'clobber',
-        'read-buildbot-config',
         'setup-avds',
         'start-emulator',
         'download-and-extract',

testing/mozharness/configs/builds/releng_base_android_64_builds.py

@@ -11,7 +11,6 @@ config = {
         '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

testing/mozharness/configs/builds/releng_base_linux_32_builds.py

@@ -15,7 +15,6 @@ config = {
         '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': [

testing/mozharness/configs/builds/releng_base_linux_64_builds.py

@@ -14,7 +14,6 @@ config = {
         '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': [

testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py

@@ -10,7 +10,6 @@ config = {
         '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': [

testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py

@@ -8,7 +8,6 @@ config = {
     # 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': [

testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py

@@ -13,11 +13,10 @@ config = {
         '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'],
     #########################################################################
 

testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py

@@ -13,13 +13,12 @@ config = {
         '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'],
     #########################################################################
 

testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py

@@ -6,7 +6,6 @@ config = {
         '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': [
@@ -18,7 +17,7 @@ config = {
          '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'],
     #########################################################################
 

testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py

@@ -6,13 +6,12 @@ config = {
         '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'],
     #########################################################################
 

testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py

@@ -20,7 +20,7 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py

@@ -17,7 +17,7 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py

@@ -6,7 +6,6 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py

@@ -2,7 +2,6 @@ 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',

testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py

@@ -6,7 +6,6 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py

@@ -6,7 +6,6 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py

@@ -8,11 +8,10 @@ config = {
         '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'],
     #########################################################################
 

testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py

@@ -8,13 +8,12 @@ config = {
         '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'],
     #########################################################################
 

testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py

@@ -15,7 +15,6 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py

@@ -16,7 +16,6 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py

@@ -18,7 +18,6 @@ releng.manifest",
         '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',

testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py

@@ -14,7 +14,6 @@ config = {
         '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',

testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py

@@ -15,7 +15,6 @@ config = {
         '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',

testing/mozharness/configs/marionette/prod_config.py

@@ -10,11 +10,8 @@ config = {
 
     "vcs_share_base": HG_SHARE_BASE_DIR,
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_actions": [
         'clobber',
-        'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
         'install',

testing/mozharness/configs/marionette/windows_config.py

@@ -12,11 +12,8 @@ config = {
         'hg': 'c:/mozilla-build/hg/hg',
     },
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_actions": [
         'clobber',
-        'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
         'install',

testing/mozharness/configs/multi_locale/ash_android-x86.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/ash_android.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/jamun_android-armv6.json

@@ -9,10 +9,6 @@
         "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",

testing/mozharness/configs/multi_locale/jamun_android-x86.json

@@ -9,10 +9,6 @@
         "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",

testing/mozharness/configs/multi_locale/jamun_android.json

@@ -9,10 +9,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-aurora_android.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-beta_android.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-central_android.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/mozilla-release_android.json

@@ -10,10 +10,6 @@
         "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",

testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/release_mozilla-release_android.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json

@@ -10,20 +10,11 @@
         "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"],

testing/mozharness/configs/partner_repacks/release_mozilla-release_android.py

@@ -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",
-    },
-}

testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_android.py

@@ -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",
-    },
-}

testing/mozharness/configs/raptor/linux64_config_taskcluster.py

@@ -15,7 +15,6 @@ 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": [
@@ -27,7 +26,6 @@ config = {
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",

testing/mozharness/configs/raptor/linux_config.py

@@ -11,7 +11,6 @@ else:
 
 config = {
     "log_name": "raptor",
-    "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "find_links": [
@@ -22,7 +21,6 @@ config = {
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",

testing/mozharness/configs/raptor/mac_config.py

@@ -14,7 +14,6 @@ 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": [
@@ -25,7 +24,6 @@ config = {
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",

testing/mozharness/configs/raptor/windows_config.py

@@ -8,7 +8,6 @@ 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,
@@ -29,7 +28,6 @@ config = {
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",

testing/mozharness/configs/raptor/windows_vm_config.py

@@ -8,7 +8,6 @@ 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,
@@ -28,7 +27,6 @@ config = {
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",

testing/mozharness/configs/releases/updates_firefox_devedition.py

@@ -24,8 +24,7 @@ config = {
             "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": [],

testing/mozharness/configs/single_locale/ash_android-api-16.py

@@ -10,7 +10,6 @@ config = {
     "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,

testing/mozharness/configs/single_locale/jamun_android-api-16.py

@@ -9,7 +9,6 @@ config = {
     "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,

testing/mozharness/configs/single_locale/maple_android-api-16.py

@@ -10,7 +10,6 @@ config = {
     "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,

testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py

@@ -12,7 +12,6 @@ config = {
     "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,

testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py

@@ -11,7 +11,6 @@ config = {
     "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,

testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py

@@ -12,7 +12,6 @@ config = {
     "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,

testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py

@@ -11,7 +11,6 @@ config = {
     "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,

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,
 }

testing/mozharness/configs/single_locale/try_android-api-16.py

@@ -10,7 +10,6 @@ config = {
     "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,

testing/mozharness/configs/talos/linux64_config_taskcluster.py

@@ -20,14 +20,12 @@ 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",

testing/mozharness/configs/talos/linux_config.py

@@ -11,13 +11,11 @@ else:
 
 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",

testing/mozharness/configs/talos/mac_config.py

@@ -14,13 +14,11 @@ 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",

testing/mozharness/configs/talos/windows_config.py

@@ -8,7 +8,6 @@ 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": {
@@ -19,7 +18,6 @@ config = {
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",

testing/mozharness/configs/talos/windows_taskcluster_config.py

@@ -8,7 +8,6 @@ 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": {

testing/mozharness/configs/talos/windows_vm_config.py

@@ -8,7 +8,6 @@ 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": {
@@ -18,7 +17,6 @@ config = {
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
-        "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",

testing/mozharness/configs/unittests/linux_unittest.py

@@ -34,7 +34,6 @@ else:
 
 #####
 config = {
-    "buildbot_json_path": "buildprops.json",
     ###
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
@@ -280,7 +279,6 @@ config = {
     ],
     "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",
     ],

testing/mozharness/configs/unittests/mac_unittest.py

@@ -8,7 +8,6 @@ DISABLE_SCREEN_SAVER = False
 ADJUST_MOUSE_AND_SCREEN = False
 #####
 config = {
-    "buildbot_json_path": "buildprops.json",
     "virtualenv_modules": ['six==1.10.0', 'vcversioner==2.16.0.0'],
     ###
     "installer_path": INSTALLER_PATH,
@@ -223,7 +222,6 @@ config = {
     ],
     "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",
     ],

testing/mozharness/configs/unittests/win_taskcluster_unittest.py

@@ -307,7 +307,6 @@ config = {
     ],
     "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",
     ],

testing/mozharness/configs/unittests/win_unittest.py

@@ -11,7 +11,6 @@ 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',
@@ -246,7 +245,6 @@ config = {
     ],
     "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",
     ],

testing/mozharness/configs/web_platform_tests/prod_config.py

@@ -16,8 +16,6 @@ config = {
         "--certutil-binary=%(test_install_path)s/bin/certutil",
     ],
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],

testing/mozharness/configs/web_platform_tests/prod_config_windows.py

@@ -25,8 +25,6 @@ config = {
         'hg': 'c:/mozilla-build/hg/hg',
     },
 
-    "buildbot_json_path": "buildprops.json",
-
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],

testing/mozharness/docs/mozharness.mozilla.testing.rst

@@ -12,14 +12,6 @@ mozharness.mozilla.testing.errors module
     :undoc-members:
     :show-inheritance:
 
-mozharness.mozilla.testing.mozpool module
------------------------------------------
-
-.. automodule:: mozharness.mozilla.testing.mozpool
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 mozharness.mozilla.testing.talos module
 ---------------------------------------
 

testing/mozharness/mach_commands.py

@@ -47,8 +47,7 @@ class MozharnessRunner(MozbuildObject):
 
         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]
             },

testing/mozharness/mozharness/mozilla/buildbot.py

@@ -54,22 +54,6 @@ class BuildbotMixin(object):
     buildbot_properties = {}
     worst_buildbot_status = TBPL_SUCCESS
 
-    def read_buildbot_config(self):
-        c = self.config
-        if not c.get("buildbot_json_path"):
-            # If we need to fail out, add postflight_read_buildbot_config()
-            self.info("buildbot_json_path is not set.  Skipping...")
-        else:
-            # TODO try/except?
-            self.buildbot_config = parse_config_file(c['buildbot_json_path'])
-            buildbot_properties = copy.deepcopy(self.buildbot_config.get('properties', {}))
-            if 'commit_titles' in buildbot_properties:
-                # Remove the commit messages since they can cause false positives with
-                # Treeherder log parsers. Eg: "Bug X - Fix TEST-UNEPXECTED-FAIL ...".
-                del buildbot_properties['commit_titles']
-            self.info("Using buildbot properties:")
-            self.info(json.dumps(buildbot_properties, indent=4))
-
     def tryserver_email(self):
         pass
 

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -14,7 +14,6 @@ import json
 
 import os
 import pprint
-import subprocess
 import time
 import uuid
 import copy
@@ -57,8 +56,7 @@ 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, \
@@ -833,17 +831,10 @@ or run without that action (ie: --no-{action})"
         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")
@@ -1085,32 +1076,20 @@ or run without that action (ie: --no-{action})"
     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):
@@ -1331,14 +1310,8 @@ or run without that action (ie: --no-{action})"
         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'):

testing/mozharness/mozharness/mozilla/l10n/locales.py

@@ -48,18 +48,6 @@ class LocalesMixin(ChunkingMixin):
         # 4. using self.config["locales_file"] l10n changesets file
         locales = None
 
-        # Buildbot property
-        if hasattr(self, 'read_buildbot_config'):
-            self.read_buildbot_config()
-            if self.buildbot_config:
-                locales = self.buildbot_config['properties'].get("locales")
-            if locales:
-                self.info("Using locales from buildbot: %s" % locales)
-                locales = locales.split()
-        else:
-            self.info("'read_buildbot_config()' is missing, ignoring buildbot"
-                      " properties")
-
         # Environment variable
         if not locales and "MOZ_LOCALES" in os.environ:
             self.debug("Using locales from environment: %s" %

testing/mozharness/mozharness/mozilla/testing/mozpool.py

@@ -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)