--- a/misc.py
+++ b/misc.py
@@ -1684,96 +1684,96 @@ def generateBranchObjects(config, name,
'mozharness_multi_options')
mozharness_repo_cache = None
if config.get('use_mozharness_repo_cache'): # branch supports it
mozharness_repo_cache = pf.get('mozharness_repo_cache')
# Some platforms shouldn't do dep builds (i.e. RPM)
if pf.get('enable_dep', True) or pf.get('enable_periodic', False):
- factory_kwargs = {
- 'env': pf['env'],
- 'objdir': pf['platform_objdir'],
- 'platform': platform,
- 'hgHost': config['hghost'],
- 'repoPath': config['repo_path'],
- 'buildToolsRepoPath': config['build_tools_repo_path'],
- 'configRepoPath': config['config_repo_path'],
- 'profiledBuild': per_checkin_build_uses_pgo,
- 'productName': pf['product_name'],
- 'mozconfig': pf['mozconfig'],
- 'srcMozconfig': pf.get('src_mozconfig'),
- 'use_mock': pf.get('use_mock'),
- 'mock_target': pf.get('mock_target'),
- 'mock_packages': pf.get('mock_packages'),
- 'mock_copyin_files': pf.get('mock_copyin_files'),
- 'stageServer': config['stage_server'],
- 'stageUsername': config['stage_username'],
- 'stageGroup': config['stage_group'],
- 'stageSshKey': config['stage_ssh_key'],
- 'stageBasePath': stageBasePath,
- 'stageLogBaseUrl': config.get('stage_log_base_url', None),
- 'stagePlatform': pf['stage_platform'],
- 'stageProduct': pf['stage_product'],
- 'graphServer': config['graph_server'],
- 'graphSelector': config['graph_selector'],
- 'graphBranch': config.get('graph_branch', config.get('tinderbox_tree', None)),
- 'doBuildAnalysis': doBuildAnalysis,
- 'baseName': pf['base_name'],
- 'checkTest': checkTest,
- 'valgrindCheck': valgrindCheck,
- 'uploadPackages': uploadPackages,
- 'uploadSymbols': uploadSymbols,
- 'disableSymbols': disableSymbols,
- 'buildSpace': buildSpace,
- 'clobberURL': config['base_clobber_url'],
- 'clobberTime': clobberTime,
- 'buildsBeforeReboot': pf['builds_before_reboot'],
- 'talosMasters': talosMasters,
- 'enablePackaging': pf.get('enable_packaging', True),
- 'enableInstaller': pf.get('enable_installer', False),
- 'packageTests': packageTests,
- 'unittestMasters': pf.get('unittest_masters', config['unittest_masters']),
- 'unittestBranch': per_checkin_unittest_branch,
- 'tinderboxBuildsDir': tinderboxBuildsDir,
- 'enable_ccache': pf.get('enable_ccache', False),
- 'useSharedCheckouts': pf.get('enable_shared_checkouts', False),
- 'testPrettyNames': pf.get('test_pretty_names', False),
- 'l10nCheckTest': pf.get('l10n_check_test', False),
- 'post_upload_include_platform': pf.get('post_upload_include_platform', False),
- 'signingServers': secrets.get(pf.get('dep_signing_servers')),
- 'baseMirrorUrls': config.get('base_mirror_urls'),
- 'baseBundleUrls': config.get('base_bundle_urls'),
- 'mozillaDir': config.get('mozilla_dir', None),
- 'mozillaSrcDir': config.get('mozilla_srcdir', None),
- 'tooltool_manifest_src': pf.get('tooltool_manifest_src'),
- 'tooltool_script': pf.get('tooltool_script'),
- 'tooltool_url_list': config.get('tooltool_url_list', []),
- 'gaiaRepo': pf.get('gaia_repo'),
- 'gaiaRevision': config.get('gaia_revision'),
- 'gaiaRevisionFile': pf.get('gaia_revision_file'),
- 'gaiaLanguagesFile': pf.get('gaia_languages_file'),
- 'gaiaLanguagesScript': pf.get('gaia_languages_script', 'scripts/b2g_desktop_multilocale.py'),
- 'gaiaL10nRoot': config.get('gaia_l10n_root'),
- 'mozharness_repo_cache': mozharness_repo_cache,
- 'tools_repo_cache': pf.get('tools_repo_cache'),
- 'mozharnessTag': config.get('mozharness_tag'),
- 'geckoL10nRoot': config.get('gecko_l10n_root'),
- 'geckoLanguagesFile': pf.get('gecko_languages_file'),
- 'enable_pymake': enable_pymake,
- }
- factory_kwargs.update(extra_args)
- if pf.get('product_name') == 'b2g':
- factory_kwargs.update(multiargs)
-
# This condition just checks to see if we used
# mozharness to create this builder already. Once we port all
# builders to mozharness we won't need mozilla2_dep_builder at
# all
if not builder_tracker['done_generic_build']:
+ factory_kwargs = {
+ 'env': pf['env'],
+ 'objdir': pf['platform_objdir'],
+ 'platform': platform,
+ 'hgHost': config['hghost'],
+ 'repoPath': config['repo_path'],
+ 'buildToolsRepoPath': config['build_tools_repo_path'],
+ 'configRepoPath': config['config_repo_path'],
+ 'profiledBuild': per_checkin_build_uses_pgo,
+ 'productName': pf['product_name'],
+ 'mozconfig': pf['mozconfig'],
+ 'srcMozconfig': pf.get('src_mozconfig'),
+ 'use_mock': pf.get('use_mock'),
+ 'mock_target': pf.get('mock_target'),
+ 'mock_packages': pf.get('mock_packages'),
+ 'mock_copyin_files': pf.get('mock_copyin_files'),
+ 'stageServer': config['stage_server'],
+ 'stageUsername': config['stage_username'],
+ 'stageGroup': config['stage_group'],
+ 'stageSshKey': config['stage_ssh_key'],
+ 'stageBasePath': stageBasePath,
+ 'stageLogBaseUrl': config.get('stage_log_base_url', None),
+ 'stagePlatform': pf['stage_platform'],
+ 'stageProduct': pf['stage_product'],
+ 'graphServer': config['graph_server'],
+ 'graphSelector': config['graph_selector'],
+ 'graphBranch': config.get('graph_branch', config.get('tinderbox_tree', None)),
+ 'doBuildAnalysis': doBuildAnalysis,
+ 'baseName': pf['base_name'],
+ 'checkTest': checkTest,
+ 'valgrindCheck': valgrindCheck,
+ 'uploadPackages': uploadPackages,
+ 'uploadSymbols': uploadSymbols,
+ 'disableSymbols': disableSymbols,
+ 'buildSpace': buildSpace,
+ 'clobberURL': config['base_clobber_url'],
+ 'clobberTime': clobberTime,
+ 'buildsBeforeReboot': pf['builds_before_reboot'],
+ 'talosMasters': talosMasters,
+ 'enablePackaging': pf.get('enable_packaging', True),
+ 'enableInstaller': pf.get('enable_installer', False),
+ 'packageTests': packageTests,
+ 'unittestMasters': pf.get('unittest_masters', config['unittest_masters']),
+ 'unittestBranch': per_checkin_unittest_branch,
+ 'tinderboxBuildsDir': tinderboxBuildsDir,
+ 'enable_ccache': pf.get('enable_ccache', False),
+ 'useSharedCheckouts': pf.get('enable_shared_checkouts', False),
+ 'testPrettyNames': pf.get('test_pretty_names', False),
+ 'l10nCheckTest': pf.get('l10n_check_test', False),
+ 'post_upload_include_platform': pf.get('post_upload_include_platform', False),
+ 'signingServers': secrets.get(pf.get('dep_signing_servers')),
+ 'baseMirrorUrls': config.get('base_mirror_urls'),
+ 'baseBundleUrls': config.get('base_bundle_urls'),
+ 'mozillaDir': config.get('mozilla_dir', None),
+ 'mozillaSrcDir': config.get('mozilla_srcdir', None),
+ 'tooltool_manifest_src': pf.get('tooltool_manifest_src'),
+ 'tooltool_script': pf.get('tooltool_script'),
+ 'tooltool_url_list': config.get('tooltool_url_list', []),
+ 'gaiaRepo': pf.get('gaia_repo'),
+ 'gaiaRevision': config.get('gaia_revision'),
+ 'gaiaRevisionFile': pf.get('gaia_revision_file'),
+ 'gaiaLanguagesFile': pf.get('gaia_languages_file'),
+ 'gaiaLanguagesScript': pf.get('gaia_languages_script', 'scripts/b2g_desktop_multilocale.py'),
+ 'gaiaL10nRoot': config.get('gaia_l10n_root'),
+ 'mozharness_repo_cache': mozharness_repo_cache,
+ 'tools_repo_cache': pf.get('tools_repo_cache'),
+ 'mozharnessTag': config.get('mozharness_tag'),
+ 'geckoL10nRoot': config.get('gecko_l10n_root'),
+ 'geckoLanguagesFile': pf.get('gecko_languages_file'),
+ 'enable_pymake': enable_pymake,
+ }
+ factory_kwargs.update(extra_args)
+ if pf.get('product_name') == 'b2g':
+ factory_kwargs.update(multiargs)
+
mozilla2_dep_factory = factory_class(**factory_kwargs)
# eg. TB Linux comm-central build
# TB Linux comm-central leak test build
mozilla2_dep_builder = {
'name': '%s build' % pf['base_name'],
'slavenames': pf['slaves'],
'builddir': '%s-%s' % (name, platform),
'slavebuilddir': normalizeName('%s-%s' % (name, platform), pf['stage_product']),