Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging from default

changeset:   2676:305a11cf90cc
tag:         tip
parent:      2673:c47fa9babd7a
user:        John Hopkins <jhopkins@mozilla.com>
date:        Tue Oct 09 17:05:27 2012 -0400
summary:     Bug 799599 - don't use mock slaves for releases until bug 798361 is done. p=rail, r=jhopkins

--HG--
branch : production-0.8
  • Loading branch information...
commit 899fff2a556478c88ed81e1243b78baa536183df 2 parents a0d9217 + cb36e59
@rail rail authored
Showing with 10 additions and 8 deletions.
  1. +10 −8 process/release.py
View
18 process/release.py
@@ -420,7 +420,7 @@ def hasPlatformSubstring(platforms, substring):
tag_factory = ScriptFactory(
scriptRepo=tools_repo,
scriptName='scripts/release/tagging.sh',
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
@@ -669,7 +669,7 @@ def hasPlatformSubstring(platforms, substring):
enableInstaller=pf.get('enable_installer', False),
tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
tooltool_url_list=branchConfig.get('tooltool_url_list', []),
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
@@ -730,7 +730,7 @@ def hasPlatformSubstring(platforms, substring):
interpreter='bash',
scriptName='scripts/l10n/release_repacks.sh',
extra_args=extra_args,
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
@@ -759,7 +759,8 @@ def hasPlatformSubstring(platforms, substring):
scriptRepo=mozharness_repo,
scriptName='scripts/mobile_l10n.py',
extra_args=extra_args,
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
@@ -787,7 +788,8 @@ def hasPlatformSubstring(platforms, substring):
scriptName='scripts/l10n/release_repacks.sh',
extra_args=extra_args,
script_timeout=2400,
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
@@ -888,7 +890,7 @@ def hasPlatformSubstring(platforms, substring):
partialUpdates=releaseConfig.get('partialUpdates', {}),
tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
tooltool_url_list=branchConfig.get('tooltool_url_list', []),
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
@@ -935,7 +937,7 @@ def hasPlatformSubstring(platforms, substring):
scriptRepo=mozharness_repo,
scriptName=mh_cfg['script'],
extra_args=extra_args,
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
@@ -960,7 +962,7 @@ def hasPlatformSubstring(platforms, substring):
signingServers=getSigningServers(platform),
enableSigning=releaseConfig.get('enableSigningAtBuildTime', True),
env=pr_pf['env'],
- use_mock=pf.get('use_mock'),
+ use_mock=releaseConfig.get('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'),
Please sign in to comment.
Something went wrong with that request. Please try again.