Bug 1371093 - Remove now redundant tooltool manifest definitions from mozharness. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 08 Jun 2017 07:48:46 +0900
changeset 411197 0c8ab344a2491cb9b293ed04ea8c7fa3c1d955e6
parent 411196 30a7983347576602e95280b0131c437ac4dc060d
child 411198 bfc4b019d8e81e3172dafda44ff36f38ab440a5e
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1371093, 1356952
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1371093 - Remove now redundant tooltool manifest definitions from mozharness. r=mshal Bug 1356952 defined tooltool manifest at the taskcluster job definition. This makes many definitions from mozharness now redundant. While this would ideally have been done in bug 1356952, some of those definitions are likely to still be used by some buildbot job or some obscure taskcluster job seldomly triggered. Preparing for the possibility that this might burn some jobs, making this removal backout-able independently allows other work to happen on top of bug 1356952 without the risk of everything having to be backed out because of some random bustage.
testing/mozharness/configs/builds/releng_base_android_64_builds.py
testing/mozharness/configs/builds/releng_base_linux_32_builds.py
testing/mozharness/configs/builds/releng_base_linux_64_builds.py
testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_old_id.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_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_old_id.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.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_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_win32_noopt_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py
testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_win64_noopt_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py
testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py
testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -107,11 +107,10 @@ config = {
                       'ccache', 'zip', "gcc472_0moz1", "gcc473_0moz1",
                       'java-1.7.0-openjdk-devel', 'zlib-devel',
                       'glibc-static', 'openssh-clients', 'mpfr',
                       'wget', 'glibc.i686', 'libstdc++.i686',
                       'zlib.i686', 'freetype-2.3.11-6.el6_1.8.x86_64',
                       'ant', 'ant-apache-regexp'
                       ],
     'src_mozconfig': 'mobile/android/config/mozconfigs/android/nightly',
-    'tooltool_manifest_src': "mobile/android/config/tooltool-manifests/android/releng.manifest",
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -146,12 +146,10 @@ config = {
         # Freetype packages need to be installed be version, because a newer
         # version is available, but we don't want it for Firefox builds.
         'freetype-2.3.11-6.el6_1.8.i686',
         'freetype-devel-2.3.11-6.el6_1.8.i686',
         'freetype-2.3.11-6.el6_1.8.x86_64',
         ######## 32 bit specific ###########
     ],
     'src_mozconfig': 'browser/config/mozconfigs/linux32/nightly',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/linux32/\
-releng.manifest",
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -125,12 +125,10 @@ config = {
         'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
         'yasm', 'ccache',
         ###
         'pulseaudio-libs-devel', 'gstreamer-devel',
         'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
         'freetype-devel-2.3.11-6.el6_1.8.x86_64'
     ],
     'src_mozconfig': 'browser/config/mozconfigs/linux64/nightly',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-releng.manifest",
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@@ -69,12 +69,11 @@ config = {
         'UPLOAD_SSH_KEY': '/Users/cltbld/.ssh/%(stage_ssh_key)s',
         'UPLOAD_TO_TEMP': '1',
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux64/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',
     },
     'src_mozconfig': 'browser/config/mozconfigs/macosx64/nightly',
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/cross-releng.manifest',
     'artifact_flag_build_variant_in_try': 'cross-artifact',
     #########################################################################
 }
--- 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,9 +1,8 @@
 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',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
     'artifact_flag_build_variant_in_try': 'aarch64-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15.py
@@ -1,9 +1,8 @@
 config = {
     'base_name': 'Android armv7 API 15+ %(branch)s',
     'stage_platform': 'android-api-15',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
     'artifact_flag_build_variant_in_try': 'api-15-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_debug.py
@@ -1,10 +1,9 @@
 config = {
     'base_name': 'Android armv7 API 15+ %(branch)s debug',
     'stage_platform': 'android-api-15-debug',
     'build_type': 'api-15-debug',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15/debug',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
     'debug_build': True,
     'artifact_flag_build_variant_in_try': 'api-15-debug-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
@@ -1,14 +1,13 @@
 config = {
     'base_name': 'Android armv7 API 15+ %(branch)s Gradle',
     'stage_platform': 'android-api-15-gradle',
     'build_type': 'api-15-gradle',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
     # It's not obvious, but postflight_build is after packaging, so the Gecko
     # binaries are in the object directory, ready to be packaged into the
     # GeckoView AAR.
     'postflight_build_mach_commands': [
         ['gradle',
          'geckoview:assembleWithGeckoBinaries',
          'geckoview_example:assembleWithGeckoBinaries',
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
@@ -1,14 +1,13 @@
 config = {
     'base_name': 'Android armv7 API 15+ Gradle dependencies %(branch)s',
     'stage_platform': 'android-api-15-gradle-dependencies',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest',
     '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': [
         ['gradle',
          'app:assembleOfficialAustralisRelease',
          'app:assembleOfficialAustralisDebug',
          'app:assembleOfficialAustralisDebugAndroidTest',
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_old_id.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_old_id.py
@@ -1,9 +1,8 @@
 config = {
     'base_name': 'Android armv7 API 15+ %(branch)s OldId',
     'stage_platform': 'android-api-15-old-id',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15/nightly-old-id',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
     'artifact_flag_build_variant_in_try': 'api-15-artifact',
 }
--- 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,14 +1,13 @@
 config = {
     'base_name': 'Android checkstyle %(branch)s',
     'stage_platform': 'android-checkstyle',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
     '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': [
         ['gradle', 'app:checkstyle'],
     ],
     'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
 }
--- 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,14 +1,13 @@
 config = {
     'base_name': 'Android findbugs %(branch)s',
     'stage_platform': 'android-findbugs',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
     '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': [
         ['gradle',
          'app:findbugsOfficialAustralisDebug',
          'app:findbugsOfficialPhotonDebug',
         ],
--- 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,14 +1,13 @@
 config = {
     'base_name': 'Android lint %(branch)s',
     'stage_platform': 'android-lint',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
     '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': [
         ['gradle',
          'app:lintOfficialAustralisDebug',
          'app:lintOfficialPhotonDebug',
         ],
--- 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,14 +1,13 @@
 config = {
     'base_name': 'Android armv7 unit tests %(branch)s',
     'stage_platform': 'android-test',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
     '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': [
         ['gradle',
          'app:testOfficialAustralisDebugUnitTest',
          'app:testOfficialPhotonDebugUnitTest',
         ],
--- 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,9 +1,8 @@
 config = {
     'base_name': 'Android 4.2 x86 %(branch)s build',
     'stage_platform': 'android-x86',
     'publish_nightly_en_US_routes': False,
     'build_type': 'x86-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
     'artifact_flag_build_variant_in_try': 'x86-artifact',
 }
--- 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,9 +1,8 @@
 config = {
     'base_name': 'Android 4.2 x86 %(branch)s build OldId',
     'stage_platform': 'android-x86-old-id',
     'publish_nightly_en_US_routes': False,
     'build_type': 'x86-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly-old-id',
-    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
     'artifact_flag_build_variant_in_try': 'x86-artifact',
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
@@ -85,12 +85,10 @@ config = {
         'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
         'yasm', 'ccache',
         ###
         'pulseaudio-libs-devel', 'gstreamer-devel',
         'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
         'freetype-devel-2.3.11-6.el6_1.8.x86_64'
     ],
     'src_mozconfig': 'browser/config/mozconfigs/linux64/artifact',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-releng.manifest",
     #######################
 }
--- 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
@@ -12,18 +12,16 @@ config = {
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan',
     'publish_nightly_en_US_routes': False,
     'build_type': 'asan',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-asan.manifest",
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_talos_sendchange': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
--- 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
@@ -13,18 +13,16 @@ config = {
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-debug',
     'publish_nightly_en_US_routes': False,
     'build_type': 'asan-debug',
     'debug_build': True,
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-asan.manifest",
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_talos_sendchange': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
--- 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
@@ -12,18 +12,16 @@ config = {
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-fuzzing-asan',
     'publish_nightly_en_US_routes': False,
     'build_type': 'asan',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-asan.manifest",
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_talos_sendchange': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
@@ -75,13 +75,11 @@ config = {
         'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
         'yasm', 'ccache',
         ###
         'pulseaudio-libs-devel', 'gstreamer-devel',
         'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
         'freetype-devel-2.3.11-6.el6_1.8.x86_64'
     ],
     'src_mozconfig': 'browser/config/mozconfigs/linux64/debug-static-analysis-clang',
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/\
-clang.manifest.centos6',
     #######################
     'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
@@ -75,13 +75,11 @@ config = {
         'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
         'yasm', 'ccache',
         ###
         'pulseaudio-libs-devel', 'gstreamer-devel',
         'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
         'freetype-devel-2.3.11-6.el6_1.8.x86_64'
     ],
     'src_mozconfig': 'browser/config/mozconfigs/linux64/opt-static-analysis-clang',
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/\
-clang.manifest.centos6',
     #######################
     'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
@@ -13,18 +13,16 @@ config = {
         #'sendchange',
         'check-test',
         'valgrind-test',
         #'update',
     ],
     'stage_platform': 'linux64-valgrind',
     'publish_nightly_en_US_routes': False,
     'build_type': 'valgrind',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-releng.manifest",
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_talos_sendchange': False,
     'perfherder_extra_options': ['valgrind'],
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'DISPLAY': ':2',
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
@@ -68,12 +68,11 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\clang',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\clang.manifest',
     'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
@@ -70,12 +70,11 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\clang-debug',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\clang.manifest',
     'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_noopt_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_noopt_debug.py
@@ -72,12 +72,11 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\noopt-debug',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\releng.manifest',
     'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py
@@ -66,11 +66,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\debug-asan',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\clang.manifest',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py
@@ -64,11 +64,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\nightly-asan',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\clang.manifest',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
@@ -64,12 +64,11 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\clang',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\clang.manifest',
     'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
@@ -66,12 +66,11 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\clang-debug',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\clang.manifest',
     'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_noopt_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_noopt_debug.py
@@ -66,12 +66,11 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\noopt-debug',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\releng.manifest',
     'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py
@@ -68,11 +68,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser/config/mozconfigs/win32/add-on-devel',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\releng.manifest',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py
@@ -70,11 +70,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\debug',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\releng.manifest',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
@@ -68,11 +68,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\nightly',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\releng.manifest',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py
@@ -65,11 +65,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser/config/mozconfigs/win64/add-on-devel',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\releng.manifest',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py
@@ -66,11 +66,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\debug',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\releng.manifest',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
@@ -64,11 +64,10 @@ config = {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\nightly',
-    'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\releng.manifest',
     #########################################################################
 }