Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merging from default

changeset:   2766:bb086f2367c3
parent:      2764:0a83a0bb56c8
user:        John Hopkins <jhopkins@mozilla.com>
date:        Tue Nov 06 11:36:03 2012 -0500
files:       process/factory.py process/release.py
description:
Bug 798361 - Make release automation work with mock slaves. r=rail, f=catlee


changeset:   2767:774710239018
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Tue Nov 06 12:23:57 2012 -0500
files:       process/release.py
description:
Bug 796995 - create mozilla-esr17 branch. r=catlee

--HG--
branch : production-0.8
  • Loading branch information...
commit cfbf99f650f7730f0a50f9b19cb2b6f934c485b1 2 parents 7c8d1ce + 36a1cde
@kmoir kmoir authored
Showing with 199 additions and 93 deletions.
  1. +142 −70 process/factory.py
  2. +57 −23 process/release.py
View
212 process/factory.py
@@ -319,7 +319,50 @@ def sortkey(request):
log.err()
return BuildFactory.newBuild(self, requests)
-class MozillaBuildFactory(RequestSortingBuildFactory):
+class MockMixin(object):
+ warnOnFailure = True
+ warnOnWarnings = True
+
+ def addMockSteps(self):
+ # do not add the steps more than once per instance
+ if (hasattr(self, '_MockMixin_added_mock_steps')):
+ return
+ self._MockMixin_added_mock_steps = 1
+
+ if self.mock_copyin_files:
+ for source, target in self.mock_copyin_files:
+ self.addStep(ShellCommand(
+ name='mock_copyin_%s' % source.replace('/','_'),
+ command=['mock_mozilla', '-r', self.mock_target,
+ '--copyin', source, target],
+ haltOnFailure=True,
+ ))
+ self.addStep(MockCommand(
+ name='mock_chown_%s' % target.replace('/','_'),
+ command='chown -R mock_mozilla %s' % target,
+ target=self.mock_target,
+ mock=True,
+ workdir='/',
+ mock_args=[],
+ mock_workdir_prefix=None,
+ ))
+ # This is needed for the builds to start
+ self.addStep(MockCommand(
+ name='mock_mkdir_basedir',
+ command=WithProperties("mkdir -p %(basedir)s" + "/%s" % self.baseWorkDir),
+ target=self.mock_target,
+ mock=True,
+ workdir='/',
+ mock_workdir_prefix=None,
+ ))
+ if self.use_mock and self.mock_packages:
+ self.addStep(MockInstall(
+ target=self.mock_target,
+ packages=self.mock_packages,
+ ))
+
+
+class MozillaBuildFactory(RequestSortingBuildFactory, MockMixin):
ignore_dirs = [ 'info', 'rel-*']
def __init__(self, hgHost, repoPath, buildToolsRepoPath, buildSpace=0,
@@ -492,6 +535,7 @@ def parse_purge_builds(rc, stdout, stderr):
self.addStep(MockInit(
target=self.mock_target,
))
+ self.addMockSteps()
def addPeriodicRebootSteps(self):
def do_disconnect(cmd):
@@ -693,8 +737,7 @@ def addGetTokenSteps(self):
name='download_token',
))
-
-class MercurialBuildFactory(MozillaBuildFactory):
+class MercurialBuildFactory(MozillaBuildFactory, MockMixin):
def __init__(self, objdir, platform, configRepoPath, configSubDir,
profiledBuild, mozconfig, srcMozconfig=None,
productName=None,
@@ -967,36 +1010,6 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
if self.buildsBeforeReboot and self.buildsBeforeReboot > 0:
self.addPeriodicRebootSteps()
- def addMockSteps(self):
- if self.mock_copyin_files:
- for source, target in self.mock_copyin_files:
- self.addStep(ShellCommand(
- command=['mock_mozilla', '-r', self.mock_target,
- '--copyin', source, target],
- haltOnFailure=True,
- ))
- self.addStep(MockCommand(
- command='chown -R mock_mozilla %s' % target,
- target=self.mock_target,
- mock=True,
- workdir='/',
- mock_args=[],
- mock_workdir_prefix=None,
- ))
- # This is needed for the builds to start
- self.addStep(MockCommand(
- command=WithProperties("mkdir -p %(basedir)s" + "/%s" % self.baseWorkDir),
- target=self.mock_target,
- mock=True,
- workdir='/',
- mock_workdir_prefix=None,
- ))
- if self.use_mock and self.mock_packages:
- self.addStep(MockInstall(
- target=self.mock_target,
- packages=self.mock_packages,
- ))
-
def addMultiLocaleRepoSteps(self):
for repo,tag in ((self.compareLocalesRepoPath,self.compareLocalesTag),
(self.mozharnessRepoPath,self.mozharnessTag)):
@@ -2589,12 +2602,14 @@ def addCreatePartialUpdateSteps(self):
workdir=self.absMozillaObjDir,
haltOnFailure=True,
))
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='unpack_current_mar',
command=['perl', mar_unpack_cmd,
'../dist/%s/%s' % (update_dir, current_mar_name)],
env=updateEnv,
haltOnFailure=True,
+ mock=self.use_mock,
+ target=self.mock_target,
workdir='%s/current' % self.absMozillaObjDir,
))
for oldVersion in self.partialUpdates:
@@ -2625,38 +2640,46 @@ def addCreatePartialUpdateSteps(self):
workdir=self.absMozillaObjDir,
haltOnFailure=True,
))
- self.addStep(RetryingShellCommand(
+ self.addStep(RetryingMockCommand(
name='get_previous_mar',
description=['get', 'previous', 'mar'],
command=['wget', '-O', 'previous.mar', '--no-check-certificate',
previousMarURL],
+ mock=self.use_mock,
+ target=self.mock_target,
workdir='%s/dist' % self.absMozillaObjDir,
haltOnFailure=True,
))
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='unpack_previous_mar',
description=['unpack', 'previous', 'mar'],
command=['perl', mar_unpack_cmd, '../dist/previous.mar'],
env=updateEnv,
+ mock=self.use_mock,
+ target=self.mock_target,
workdir='%s/previous' % self.absMozillaObjDir,
haltOnFailure=True,
))
for dir in ['current', 'previous']:
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='remove pgc files (%s)' % dir,
command="find . -name \*.pgc -print -delete",
env=updateEnv,
+ mock=self.use_mock,
+ target=self.mock_target,
workdir="%s/%s" % (self.absMozillaObjDir, dir),
flunkOnFailure=False,
haltOnFailure=False,
))
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='make_partial_mar',
description=self.makeCmd + ['partial', 'mar'],
command=['bash', partial_mar_cmd,
'%s/%s' % (update_dir, partial_mar_name),
'../previous', '../current'],
env=updateEnv,
+ mock=self.use_mock,
+ target=self.mock_target,
workdir='%s/dist' % self.absMozillaObjDir,
haltOnFailure=True,
))
@@ -2675,11 +2698,13 @@ def addCreatePartialUpdateSteps(self):
(self.absMozillaObjDir, update_dir, partial_mar_name)
cmd = '%s -f mar -f gpg "%s"' % (self.signing_command,
partial_mar_path)
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='sign_partial_mar',
description=['sign', 'partial', 'mar'],
command=['bash', '-c', WithProperties(cmd)],
env=updateEnv,
+ mock=self.use_mock,
+ target=self.mock_target,
workdir='.',
haltOnFailure=True,
))
@@ -2691,20 +2716,25 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
self.UPLOAD_EXTRA_FILES.append(info_txt)
# Make sure the complete MAR has been generated
if self.enableUpdatePackaging:
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='make_update_pkg',
command=self.makeCmd + ['-C',
'%s/tools/update-packaging' % self.mozillaObjdir],
env=self.env,
- haltOnFailure=True
+ haltOnFailure=True,
+ mock=self.use_mock,
+ target=self.mock_target,
+ workdir='build',
))
if self.createPartial:
self.addCreatePartialUpdateSteps()
- self.addStep(ShellCommand(
- name='echo_buildID',
- command=['bash', '-c',
- WithProperties('echo buildID=%(buildid)s > ' + info_txt)],
- workdir='build/%s/dist' % self.mozillaObjdir
+ self.addStep(MockCommand(
+ name='echo_buildID',
+ command=['bash', '-c',
+ WithProperties('echo buildID=%(buildid)s > ' + info_txt)],
+ workdir='build/%s/dist' % self.mozillaObjdir,
+ mock=self.use_mock,
+ target=self.mock_target,
))
uploadEnv = self.env.copy()
@@ -2755,6 +2785,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
log_eval_func=lambda c,s: regex_log_evaluator(c, s, upload_errors),
target=self.mock_target,
mock=self.use_mock,
+ mock_workdir_prefix=None,
))
if self.productName == 'fennec' and not uploadMulti:
@@ -2835,7 +2866,7 @@ def get_url(rc, stdout, stderr):
return {'packageUrl': m}
return {'packageUrl': ''}
- self.addStep(RetryingSetProperty(
+ self.addStep(RetryingMockProperty(
command=self.makeCmd + ['-f', 'client.mk', 'upload'],
env=uploadEnv,
workdir='build',
@@ -2843,6 +2874,8 @@ def get_url(rc, stdout, stderr):
haltOnFailure=True,
description=['upload'],
log_eval_func=lambda c,s: regex_log_evaluator(c, s, upload_errors),
+ mock=self.use_mock,
+ target=self.mock_target,
))
@@ -3723,17 +3756,22 @@ def __init__(self, username, sshKey, repositories, userRepoRoot,
command += ' && { '
command += 'if wget -q -O /dev/null %s; then ' % userRepoURL
# if it exists, delete it
- command += 'echo "Deleting %s"; ' % repoName
+ command += 'echo "Deleting %s"; sleep 2; ' % repoName
command += 'ssh -l %s -i %s %s edit %s delete YES; ' % \
(username, sshKey, self.hgHost, repoName)
command += 'else echo "Not deleting %s"; exit 0; fi }' % repoName
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='delete_repo',
command=['bash', '-c', command],
description=['delete', repoName],
haltOnFailure=True,
- timeout=30*60 # 30 minutes
+ timeout=30*60, # 30 minutes
+ mock=self.use_mock,
+ target=self.mock_target,
+ workdir=WithProperties('%(basedir)s'),
+ mock_workdir_prefix=None,
+ env=self.env,
))
# Wait for hg.m.o to catch up
@@ -3753,11 +3791,15 @@ def __init__(self, username, sshKey, repositories, userRepoRoot,
'ssh', '-l', username, '-oIdentityFile=%s' % sshKey,
self.hgHost, 'clone', repoName, repoPath]
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='recreate_repo',
command=command,
description=['recreate', repoName],
- timeout=timeout
+ timeout=timeout,
+ mock=self.use_mock,
+ target=self.mock_target,
+ workdir=WithProperties('%(basedir)s'),
+ mock_workdir_prefix=None,
))
# Wait for hg.m.o to catch up
@@ -3843,32 +3885,38 @@ def __init__(self, productName, version, baseTag, stagingServer,
haltOnFailure=True
))
self.addConfigSteps(workdir=self.mozillaSrcDir)
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='configure',
command=self.makeCmd + ['-f', 'client.mk', 'configure'],
workdir=self.mozillaSrcDir,
env=self.env,
description=['configure'],
+ mock=self.use_mock,
+ target=self.mock_target,
haltOnFailure=True
))
if self.enableSigning and self.signingServers:
self.addGetTokenSteps()
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='make_source-package',
command=self.makeCmd + ['source-package', 'hg-bundle',
WithProperties('HG_BUNDLE_REVISION=%(revision)s')],
workdir="%s/%s" % (self.mozillaSrcDir, self.mozillaObjdir),
env=self.env,
description=['make source-package'],
+ mock=self.use_mock,
+ target=self.mock_target,
haltOnFailure=True,
- timeout=45*60 # 45 minutes
+ timeout=60*60 # 60 minutes
))
- self.addStep(RetryingShellCommand(
+ self.addStep(RetryingMockCommand(
name='upload_files',
command=self.makeCmd + ['source-upload', 'UPLOAD_HG_BUNDLE=1'],
workdir="%s/%s" % (self.mozillaSrcDir, self.mozillaObjdir),
env=uploadEnv,
description=['upload files'],
+ mock=self.use_mock,
+ target=self.mock_target,
))
def addConfigSteps(self, workdir='build'):
@@ -4037,11 +4085,14 @@ def setChannelData(self):
self.testChannel = 'betatest'
def bumpConfigs(self):
- self.addStep(RetryingShellCommand(
+ self.addStep(RetryingMockCommand(
name='get_shipped_locales',
command=['wget', '-O', 'shipped-locales', self.shippedLocales],
description=['get', 'shipped-locales'],
workdir='.',
+ env=self.env,
+ mock=self.use_mock,
+ target=self.mock_target,
haltOnFailure=True
))
bumpCommand = ['perl', 'tools/release/patcher-config-bump.pl',
@@ -4061,12 +4112,16 @@ def bumpConfigs(self):
bumpCommand.extend(['-n', self.releaseNotesUrl])
if self.schema:
bumpCommand.extend(['-s', str(self.schema)])
- self.addStep(ShellCommand(
+ bump_env = self.env.copy()
+ bump_env['PERL5LIB'] = 'tools/lib/perl'
+ self.addStep(MockCommand(
name='bump',
command=bumpCommand,
description=['bump patcher config'],
- env={'PERL5LIB': 'tools/lib/perl'},
+ env=bump_env,
workdir='.',
+ mock=self.use_mock,
+ target=self.mock_target,
haltOnFailure=True
))
@@ -4085,10 +4140,13 @@ def bumpConfigs(self):
'-b', self.getRepository(self.configRepoPath),
'--channel', self.testChannel,
'-t', releaseTag]
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='bump_verify_configs',
command=command,
workdir='.',
+ env=self.env,
+ mock=self.use_mock,
+ target=self.mock_target,
description=['bump', self.verifyConfigs[platform]],
haltOnFailure=True,
))
@@ -4098,7 +4156,7 @@ def bumpConfigs(self):
workdir='tools',
ignoreCodes=[0,1]
))
- self.addStep(ShellCommand(
+ self.addStep(MockCommand(
name='commit_configs',
command=['hg', 'commit', '-u', self.hgUsername, '-m',
'Automated configuration bump: update configs ' + \
@@ -4107,6 +4165,9 @@ def bumpConfigs(self):
],
description=['commit configs'],
workdir='tools',
+ env=self.env,
+ mock=self.use_mock,
+ target=self.mock_target,
haltOnFailure=True
))
self.addStep(SetProperty(
@@ -4123,13 +4184,16 @@ def bumpConfigs(self):
workdir='tools',
haltOnFailure=True
))
- self.addStep(RetryingShellCommand(
+ self.addStep(RetryingMockCommand(
name='push_configs',
command=['hg', 'push', '-e',
'ssh -l %s %s' % (self.hgUsername, sshKeyOption),
'-f', pushRepo],
description=['push configs'],
workdir='tools',
+ mock=self.use_mock,
+ target=self.mock_target,
+ env=self.env,
haltOnFailure=True
))
@@ -4141,12 +4205,16 @@ def createPatches(self):
'--snippet-dir', 'aus2',
'--test-snippet-dir', 'aus2.test',
'-v']
- self.addStep(ShellCommand(
+ snippet_env = self.env.copy()
+ snippet_env['PYTHONPATH'] = 'tools/lib/python:tools/lib/python/vendor'
+ self.addStep(MockCommand(
name='create_snippets',
command=command,
- env={'PYTHONPATH': 'tools/lib/python:tools/lib/python/vendor'},
+ env=snippet_env,
description=['create', 'snippets'],
workdir='.',
+ mock=self.use_mock,
+ target=self.mock_target,
haltOnFailure=True
))
@@ -4177,14 +4245,18 @@ def createBuildNSnippets(self):
command.extend(['--channel', 'beta'])
if self.testOlderPartials:
command.extend(['--generate-partials'])
- self.addStep(ShellCommand(
+ snippet_env = self.env.copy()
+ snippet_env['PYTHONPATH'] = WithProperties('%(toolsdir)s/lib/python')
+ self.addStep(MockCommand(
name='create_buildN_snippets',
command=command,
description=['generate snippets', 'for prior',
'%s builds' % self.version],
- env={'PYTHONPATH': WithProperties('%(toolsdir)s/lib/python')},
+ env=snippet_env,
haltOnFailure=False,
flunkOnFailure=False,
+ mock=self.use_mock,
+ target=self.mock_target,
workdir='.'
))
@@ -6173,11 +6245,13 @@ def preRunScript(self):
if self.mock_copyin_files:
for source, target in self.mock_copyin_files:
self.addStep(ShellCommand(
+ name='mock_copyin_%s' % source.replace('/','_'),
command=['mock_mozilla', '-r', self.mock_target,
'--copyin', source, target],
haltOnFailure=True,
))
self.addStep(MockCommand(
+ name='mock_chown_%s' % target.replace('/','_'),
command='chown -R mock_mozilla %s' % target,
target=self.mock_target,
mock=True,
@@ -6245,11 +6319,9 @@ def do_disconnect(cmd):
class SigningScriptFactory(ScriptFactory):
- def __init__(self, signingServers, env, enableSigning=True,
- **kwargs):
+ def __init__(self, signingServers, enableSigning=True, **kwargs):
self.signingServers = signingServers
self.enableSigning = enableSigning
- self.platform_env = env
ScriptFactory.__init__(self, **kwargs)
def runScript(self):
@@ -6284,6 +6356,6 @@ def runScript(self):
workdir='.',
))
self.env['MOZ_SIGN_CMD'] = WithProperties(get_signing_cmd(
- self.signingServers, self.platform_env.get('PYTHON26')))
+ self.signingServers, self.env.get('PYTHON26')))
ScriptFactory.runScript(self)
View
80 process/release.py
@@ -73,6 +73,7 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
branchConfigFile = getRealpath('localconfig.py')
unix_slaves = []
+ mock_slaves = []
all_slaves = []
for p in branchConfig['platforms']:
if p == 'b2g':
@@ -81,7 +82,10 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
all_slaves.extend(platform_slaves)
if 'win' not in p:
unix_slaves.extend(platform_slaves)
+ if branchConfig['platforms'][p].get('use_mock'):
+ mock_slaves.extend(platform_slaves)
unix_slaves = [x for x in set(unix_slaves)]
+ mock_slaves = [x for x in set(mock_slaves)]
all_slaves = [x for x in set(all_slaves)]
manuallySignedPlatforms = ()
@@ -296,6 +300,13 @@ def hasPlatformSubstring(platforms, substring):
platforms = (platforms,)
return bool([p for p in platforms if substring in p])
+ def use_mock(platform):
+ pf = branchConfig['platforms'][platform]
+ if releaseConfig.get('use_mock', pf.get('use_mock')):
+ if platform in releaseConfig['mock_platforms']:
+ return True
+ return False
+
def getMessageId():
md5 = hashlib.md5(getMessageTag())
for key in ("version", "buildNumber", "productName"):
@@ -325,6 +336,8 @@ def getMessageId():
'CLOBBERER_URL': clobberer_url,
}
+ if use_mock('linux'):
+ unix_slaves = mock_slaves
if releaseConfig.get('enable_repo_setup'):
if not releaseConfig.get('skip_repo_setup'):
clone_repositories = dict()
@@ -341,15 +354,22 @@ def getMessageId():
sourceRepoInfo['relbranch'])
clone_repositories.update(l10n_clone_repos)
+ pf = branchConfig['platforms']['linux']
+ hgSshKey = releaseConfig['hgSshKey']
repository_setup_factory = StagingRepositorySetupFactory(
hgHost=branchConfig['hghost'],
buildToolsRepoPath=tools_repo_path,
username=releaseConfig['hgUsername'],
- sshKey=releaseConfig['hgSshKey'],
+ sshKey=hgSshKey,
repositories=clone_repositories,
clobberURL=clobberer_url,
clobberBranch='release-%s' % sourceRepoInfo['name'],
userRepoRoot=releaseConfig['userRepoRoot'],
+ use_mock=use_mock('linux'),
+ mock_target=pf.get('mock_target'),
+ mock_packages=pf.get('mock_packages'),
+ mock_copyin_files=pf.get('mock_copyin_files'),
+ env=pf['env'],
)
builders.append({
@@ -416,13 +436,15 @@ def getMessageId():
if not releaseConfig.get('skip_tag'):
pf = branchConfig['platforms']['linux']
tag_env = builder_env.copy()
+ if pf['env'].get('PATH'):
+ tag_env['PATH'] = pf['env']['PATH']
if pf['env'].get('HG_SHARE_BASE_DIR', None):
tag_env['HG_SHARE_BASE_DIR'] = pf['env']['HG_SHARE_BASE_DIR']
tag_factory = ScriptFactory(
scriptRepo=tools_repo,
scriptName='scripts/release/tagging.sh',
- use_mock=releaseConfig.get('use_mock', pf.get('use_mock')),
+ use_mock=use_mock('linux'),
mock_target=pf.get('mock_target'),
mock_packages=pf.get('mock_packages'),
mock_copyin_files=pf.get('mock_copyin_files'),
@@ -431,8 +453,7 @@ def getMessageId():
builders.append({
'name': builderPrefix('%s_tag' % releaseConfig['productName']),
- 'slavenames': pf['slaves'] + \
- branchConfig['platforms']['linux64']['slaves'],
+ 'slavenames': pf['slaves'],
'category': builderPrefix(''),
'builddir': builderPrefix('%s_tag' % releaseConfig['productName']),
'slavebuilddir': reallyShort(
@@ -467,6 +488,11 @@ def getMessageId():
platform_env = pf['env'].copy()
platform_env['COMM_REV'] = releaseTag
platform_env['MOZILLA_REV'] = releaseTag
+ # do not use use_mock(platform) check because we are building source
+ # packages on the linux platform, else the |platform in mock_platforms|
+ # check will fail for android.
+ source_use_mock = releaseConfig.get('use_mock')
+
source_factory = SingleSourceFactory(
env=platform_env,
objdir=pf['platform_objdir'],
@@ -489,6 +515,11 @@ def getMessageId():
configSubDir=branchConfig['config_subdir'],
signingServers=getSigningServers('linux'),
enableSigning=releaseConfig.get('enableSigningAtBuildTime', True),
+ mozconfigBranch=releaseTag,
+ use_mock=source_use_mock,
+ mock_target=pf.get('mock_target'),
+ mock_packages=pf.get('mock_packages'),
+ mock_copyin_files=pf.get('mock_copyin_files'),
)
builders.append({
@@ -537,6 +568,11 @@ def getMessageId():
configSubDir=branchConfig['config_subdir'],
signingServers=getSigningServers('linux'),
enableSigning=releaseConfig.get('enableSigningAtBuildTime', True),
+ mozconfigBranch=releaseTag,
+ use_mock=use_mock('linux'),
+ mock_target=pf.get('mock_target'),
+ mock_packages=pf.get('mock_packages'),
+ mock_copyin_files=pf.get('mock_copyin_files'),
)
builders.append({
@@ -673,7 +709,7 @@ def getMessageId():
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=releaseConfig.get('use_mock', pf.get('use_mock')),
+ use_mock=use_mock(platform),
mock_target=pf.get('mock_target'),
mock_packages=pf.get('mock_packages'),
mock_copyin_files=pf.get('mock_copyin_files'),
@@ -734,7 +770,7 @@ def getMessageId():
interpreter='bash',
scriptName='scripts/l10n/release_repacks.sh',
extra_args=extra_args,
- use_mock=releaseConfig.get('use_mock', pf.get('use_mock')),
+ use_mock=use_mock(platform),
mock_target=pf.get('mock_target'),
mock_packages=pf.get('mock_packages'),
mock_copyin_files=pf.get('mock_copyin_files'),
@@ -763,11 +799,6 @@ def getMessageId():
scriptRepo=mozharness_repo,
scriptName='scripts/mobile_l10n.py',
extra_args=extra_args,
- 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'),
env=env,
)
else:
@@ -792,8 +823,7 @@ def getMessageId():
scriptName='scripts/l10n/release_repacks.sh',
extra_args=extra_args,
script_timeout=2400,
- use_mock=releaseConfig.get('use_mock',
- pf.get('use_mock')),
+ use_mock=use_mock(platform),
mock_target=pf.get('mock_target'),
mock_packages=pf.get('mock_packages'),
mock_copyin_files=pf.get('mock_copyin_files'),
@@ -893,7 +923,7 @@ def getMessageId():
partialUpdates=releaseConfig.get('partialUpdates', {}),
tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
tooltool_url_list=branchConfig.get('tooltool_url_list', []),
- use_mock=releaseConfig.get('use_mock', pf.get('use_mock')),
+ use_mock=use_mock(platform),
mock_target=pf.get('mock_target'),
mock_packages=pf.get('mock_packages'),
mock_copyin_files=pf.get('mock_copyin_files'),
@@ -940,10 +970,6 @@ def getMessageId():
scriptRepo=mozharness_repo,
scriptName=mh_cfg['script'],
extra_args=extra_args,
- 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'),
env=builder_env,
)
else:
@@ -965,10 +991,6 @@ def getMessageId():
signingServers=getSigningServers(platform),
enableSigning=releaseConfig.get('enableSigningAtBuildTime', True),
env=pr_pf['env'],
- 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'),
)
partner_repack_factory = PartnerRepackFactory(**repack_params)
@@ -1076,6 +1098,7 @@ def getMessageId():
if releaseConfig.get('verifyConfigs') and \
not releaseConfig.get('skip_updates'):
+ pf = branchConfig['platforms']['linux']
try:
moz_repo_path = releaseConfig['sourceRepositories']['mozilla']['path']
except KeyError:
@@ -1116,7 +1139,12 @@ def getMessageId():
signingServers=getSigningServers('linux'),
useChecksums=releaseConfig.get('enablePartialMarsAtBuildTime', True),
mozRepoPath=moz_repo_path,
+ env=branchConfig['platforms']['linux']['env'],
python=branchConfig['platforms']['linux']['env'].get('PYTHON26', 'python'),
+ use_mock=use_mock('linux'),
+ mock_target=pf.get('mock_target'),
+ mock_packages=pf.get('mock_packages'),
+ mock_copyin_files=pf.get('mock_copyin_files'),
)
builders.append({
@@ -1153,6 +1181,7 @@ def getMessageId():
post_signing_builders.append(builderPrefix('updates'))
for platform in sorted(releaseConfig.get('verifyConfigs', {}).keys()):
+ vpf = branchConfig['platforms'][platform]
for n, builderName in updateVerifyBuilders(platform).iteritems():
uv_factory = ScriptFactory(
scriptRepo=tools_repo,
@@ -1160,7 +1189,12 @@ def getMessageId():
scriptName='scripts/release/updates/chunked-verify.sh',
extra_args=[platform, 'verifyConfigs',
str(updateVerifyChunks), str(n)],
- log_eval_func=lambda c, s: regex_log_evaluator(c, s, update_verify_error)
+ log_eval_func=lambda c, s: regex_log_evaluator(c, s, update_verify_error),
+ use_mock=use_mock(platform),
+ mock_target=vpf.get('mock_target'),
+ mock_packages=vpf.get('mock_packages'),
+ mock_copyin_files=vpf.get('mock_copyin_files'),
+ env=branchConfig['platforms'][platform]['env'],
)
builddir = builderPrefix('%s_update_verify' % platform) + \
Please sign in to comment.
Something went wrong with that request. Please try again.