Bug 1447760: remove unused build_type mozharness config r=tomprince
authorChris AtLee <catlee@mozilla.com>
Wed, 21 Mar 2018 12:55:10 -0400
changeset 454371 f7dea63663c70d55234ff246932fcff5b0f3fe66
parent 454370 7b9a6f304c95ba963b76e15bf6e05d26a390e23f
child 454372 58ce634dd5affb85fe7360194cab3198c391cba9
push id148
push userfmarier@mozilla.com
push dateThu, 29 Mar 2018 23:06:47 +0000
reviewerstomprince
bugs1447760
milestone61.0a1
Bug 1447760: remove unused build_type mozharness config r=tomprince MozReview-Commit-ID: CBO0RUGL4t1
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_partner_sample1.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_findbugs.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_artifact.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
testing/mozharness/configs/single_locale/ash_android-api-16.py
testing/mozharness/configs/single_locale/date_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/try_android-api-16.py
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
@@ -1,8 +1,7 @@
 config = {
     'base_name': 'Android aarch64 API 21+ %(branch)s',
     'stage_platform': 'android-aarch64',
-    'build_type': 'aarch64-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-aarch64/nightly',
     'multi_locale_config_platform': 'android',
     'artifact_flag_build_variant_in_try': 'aarch64-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py
@@ -1,8 +1,7 @@
 config = {
     'base_name': 'Android armv7 api-16+ %(branch)s',
     'stage_platform': 'android-api-16',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly',
     'multi_locale_config_platform': 'android',
     'artifact_flag_build_variant_in_try': 'api-16-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_artifact.py
@@ -1,8 +1,7 @@
 config = {
     'base_name': 'Android armv7 api-16+ %(branch)s Artifact build',
     'stage_platform': 'android-api-16',
-    'build_type': 'api-16-opt-artifact',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-artifact',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py
@@ -1,9 +1,8 @@
 config = {
     'base_name': 'Android armv7 api-16+ %(branch)s debug',
     'stage_platform': 'android-api-16-debug',
-    'build_type': 'api-16-debug',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/debug',
     'multi_locale_config_platform': 'android',
     'debug_build': True,
     'artifact_flag_build_variant_in_try': 'api-16-debug-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_artifact.py
@@ -1,9 +1,8 @@
 config = {
     'base_name': 'Android armv7 api-16+ %(branch)s debug Artifact build',
     'stage_platform': 'android-api-16-debug',
-    'build_type': 'api-16-debug-artifact',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/debug-artifact',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
     'debug_build': True,
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py
@@ -1,12 +1,11 @@
 config = {
     'base_name': 'Android armv7 api-16+ Gradle dependencies %(branch)s',
     'stage_platform': 'android-api-16-gradle-dependencies',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly',
     'multi_locale_config_platform': 'android',
      # gradle-dependencies doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'gradle-dependencies',
         ],
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py
@@ -1,8 +1,7 @@
 config = {
     'base_name': 'Android armv7 api-16+ %(branch)s OldId',
     'stage_platform': 'android-api-16-old-id',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-old-id',
     'multi_locale_config_platform': 'android',
     'artifact_flag_build_variant_in_try': 'api-16-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_partner_sample1.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_partner_sample1.py
@@ -1,9 +1,8 @@
 config = {
     'base_name': 'Android armv7 api-16+ partner Sample1 %(branch)s',
     'stage_platform': 'android-api-16-partner-sample1',
-    'build_type': 'api-16-partner-sample1-opt',
     'src_mozconfig': None,  # use manifest to determine mozconfig src
     'src_mozconfig_manifest': 'partner/mozconfigs/mozconfig1.json',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py
@@ -1,8 +1,7 @@
 config = {
     'base_name': 'Android armv7 api-16+ %(branch)s --without-google-play-services',
     'stage_platform': 'android-api-16',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services',
     'multi_locale_config_platform': 'android',
     'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
@@ -1,12 +1,11 @@
 config = {
     'base_name': 'Android checkstyle %(branch)s',
     'stage_platform': 'android-checkstyle',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16-frontend/nightly',
     'multi_locale_config_platform': 'android',
     # checkstyle doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'checkstyle',
         ],
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_findbugs.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_findbugs.py
@@ -1,12 +1,11 @@
 config = {
     'base_name': 'Android findbugs %(branch)s',
     'stage_platform': 'android-findbugs',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16-frontend/nightly',
     'multi_locale_config_platform': 'android',
     # findbugs doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'findbugs',
         ],
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
@@ -1,12 +1,11 @@
 config = {
     'base_name': 'Android GeckoView docs %(branch)s',
     'stage_platform': 'android-geckoview-docs',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16-frontend/nightly',
     'multi_locale_config_platform': 'android',
     # geckoview-docs doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'geckoview-docs',
          '--archive',
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
@@ -1,12 +1,11 @@
 config = {
     'base_name': 'Android lint %(branch)s',
     'stage_platform': 'android-lint',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16-frontend/nightly',
     'multi_locale_config_platform': 'android',
     # lint doesn't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'lint',
         ],
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
@@ -1,12 +1,11 @@
 config = {
     'base_name': 'Android armv7 unit tests %(branch)s',
     'stage_platform': 'android-test',
-    'build_type': 'api-16-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16-frontend/nightly',
     'multi_locale_config_platform': 'android',
     # unit tests don't produce a package. So don't collect package metrics.
     'disable_package_metrics': True,
     'postflight_build_mach_commands': [
         ['android',
          'test',
         ],
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
@@ -1,7 +1,6 @@
 config = {
     'base_name': 'Android 4.2 x86 %(branch)s build',
     'stage_platform': 'android-x86',
-    'build_type': 'x86-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly',
     'artifact_flag_build_variant_in_try': 'x86-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_artifact.py
@@ -1,7 +1,6 @@
 config = {
     'base_name': 'Android 4.2 x86 %(branch)s Artifact build',
     'stage_platform': 'android-x86',
-    'build_type': 'x86-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly-artifact',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py
@@ -1,7 +1,6 @@
 config = {
     'base_name': 'Android 4.2 x86 %(branch)s build OldId',
     'stage_platform': 'android-x86-old-id',
-    'build_type': 'x86-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly-old-id',
     'artifact_flag_build_variant_in_try': 'x86-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-add-on-devel',
-    'build_type': 'add-on-devel',
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan',
-    'build_type': 'asan',
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-debug',
-    'build_type': 'asan-debug',
     'debug_build': True,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-reporter',
-    'build_type': 'asan',
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan',
-    'build_type': 'asan',
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-debug',
-    'build_type': 'asan-debug',
     'debug_build': True,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-fuzzing-asan',
-    'build_type': 'asan',
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
@@ -4,17 +4,16 @@ config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
         'valgrind-test',
         #'update',
     ],
     'stage_platform': 'linux64-valgrind',
-    'build_type': 'valgrind',
     'enable_signing': False,
     'perfherder_extra_options': ['valgrind'],
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
 #        'update',
     ],
     'stage_platform': 'macosx64-add-on-devel',
-    'build_type': 'add-on-devel',
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py
@@ -2,17 +2,16 @@ import os
 
 config = {
     'default_actions': [
         'clobber',
         'build',
     ],
     'stage_platform': 'macosx64-fuzzing-asan',
     'publish_nightly_en_US_routes': False,
-    'build_type': 'asan',
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': '%(abs_obj_dir)s',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'update',  # decided by query_is_nightly()
     ],
     'debug_build': True,
     'stage_platform': 'macosx64-st-an-debug',
-    'build_type': 'st-an-debug',
     'tooltool_manifest_src': "browser/config/tooltool-manifests/macosx64/\
 clang.manifest",
     'enable_signing': False,
     'perfherder_extra_options': ['static-analysis'],
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
--- 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
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
 #        'update',
     ],
     'stage_platform': 'win32-add-on-devel',
-    'build_type': 'add-on-devel',
     #### 32 bit build specific #####
     'env': {
         'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
         '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;'
--- 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
@@ -3,17 +3,16 @@ import os
 config = {
     'default_actions': [
         'clobber',
         'build',
         'check-test',
 #        'update',
     ],
     'stage_platform': 'win64-add-on-devel',
-    'build_type': 'add-on-devel',
     #### 64 bit build specific #####
     'env': {
         'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
         '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;'
--- a/testing/mozharness/configs/single_locale/ash_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-16.py
@@ -46,17 +46,16 @@ config = {
         "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
         "MOZ_OBJDIR": OBJDIR,
         "EN_US_BINARY_URL": EN_US_BINARY_URL,
         "MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "platform": "android",
-    "build_type": "api-16-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 
     # Mock
     "mock_target": "mozilla-centos6-x86_64-android",
     "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                       'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
--- a/testing/mozharness/configs/single_locale/date_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/date_android-api-16.py
@@ -48,17 +48,16 @@ config = {
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",
-    "build_type": "api-16-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 
     # Mock
     "mock_target": "mozilla-centos6-x86_64-android",
     "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                       'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
@@ -43,17 +43,16 @@ config = {
         "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
         "MOZ_OBJDIR": "obj-firefox",
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "MOZ_UPDATE_CHANNEL": "nightly-jamun",
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "platform": "android",
-    "build_type": "api-16-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 
     # Mock
     "mock_target": "mozilla-centos6-x86_64-android",
     "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                       'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
--- a/testing/mozharness/configs/single_locale/maple_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/maple_android-api-16.py
@@ -44,17 +44,16 @@ config = {
         "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
         "MOZ_OBJDIR": "obj-firefox",
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "MOZ_UPDATE_CHANNEL": "nightly-maple",
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "platform": "android",
-    "build_type": "api-16-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 
     # Mock
     "mock_target": "mozilla-centos6-x86_64-android",
     "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                       'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
@@ -50,17 +50,16 @@ config = {
         "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
         "MOZ_OBJDIR": OBJDIR,
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "platform": "android",
-    "build_type": "api-16-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 
     # Mock
     "mock_target": "mozilla-centos6-x86_64-android",
     "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                       'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
@@ -17,17 +17,16 @@ config = {
     "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",
     "platform": "android",
     "is_release_or_beta": True,
-    "build_type": "api-16-opt",
     "build_target": "Android_arm-eabi-gcc3",
     "tooltool_config": {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
         "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
     },
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "branch": "default",
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
@@ -50,17 +50,16 @@ config = {
         "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
         "MOZ_OBJDIR": OBJDIR,
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "platform": "android",
-    "build_type": "api-16-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 
     # Mock
     "mock_target": "mozilla-centos6-x86_64-android",
     "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                       'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
@@ -17,17 +17,16 @@ config = {
     "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",
     "platform": "android",
     "is_release_or_beta": True,
-    "build_type": "api-16-opt",
     "build_target": "Android_arm-eabi-gcc3",
     "tooltool_config": {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
         "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
     },
     "repos": [{
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "branch": "default",
--- a/testing/mozharness/configs/single_locale/try_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-16.py
@@ -47,17 +47,16 @@ config = {
         "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
         "MOZ_OBJDIR": "obj-firefox",
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "MOZ_UPDATE_CHANNEL": "try", # XXX Invalid
     },
     "upload_branch": "%s-android-api-16" % BRANCH,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "platform": "android", # XXX Validate
-    "build_type": "api-16-opt", # XXX Validate
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 
     # Mock
     "mock_target": "mozilla-centos6-x86_64-android",
     "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                       'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',