Bug 1408484: Sign release partials with SHA384 when requested.
MozReview-Commit-ID: C8gduv92oqR
--- a/process/factory.py
+++ b/process/factory.py
@@ -2271,25 +2271,26 @@ class NightlyBuildFactory(MercurialBuild
))
class ReleaseBuildFactory(MercurialBuildFactory):
def __init__(
self, env, version, buildNumber, partialUpdates, ftpServer, brandName=None,
unittestMasters=None, unittestBranch=None, talosMasters=None,
usePrettyNames=True, enableUpdatePackaging=True, appVersion=None,
- bucketPrefix=None, **kwargs):
+ bucketPrefix=None, marSignatureFormat='mar', **kwargs):
self.version = version
self.buildNumber = buildNumber
self.partialUpdates = partialUpdates
self.ftpServer = ftpServer
self.talosMasters = talosMasters or []
self.unittestMasters = unittestMasters or []
self.unittestBranch = unittestBranch
self.enableUpdatePackaging = enableUpdatePackaging
+ self.marSignatureFormat = marSignatureFormat
if self.unittestMasters:
assert self.unittestBranch
if brandName:
self.brandName = brandName
else:
self.brandName = kwargs['productName'].capitalize()
self.bucketPrefix = bucketPrefix
@@ -2439,17 +2440,19 @@ class ReleaseBuildFactory(MercurialBuild
workdir='%s/dist' % self.absMozillaObjDir,
haltOnFailure=True,
))
self.UPLOAD_EXTRA_FILES.append(
'%s/%s' % (self.update_dir, partial_mar_name))
if self.enableSigning and self.signingServers:
partial_mar_path = '%s/dist/%s/%s' % \
(self.absMozillaObjDir, self.update_dir, partial_mar_name)
- cmd = '%s -f mar "%s"' % (self.signing_command, partial_mar_path)
+ cmd = '%s -f %s "%s"' % (self.signing_command,
+ self.marSignatureFormat,
+ partial_mar_path)
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='.',
--- a/process/release.py
+++ b/process/release.py
@@ -634,16 +634,17 @@ def generateReleaseBranchObjects(release
mock_packages=pf.get('mock_packages'),
mock_copyin_files=pf.get('mock_copyin_files'),
enable_pymake=enable_pymake,
balrog_api_root=balrog_api_root,
balrog_username=balrog_username,
balrog_credentials_file=balrog_credentials_file,
bucketPrefix=branchConfig.get('bucket_prefix'),
ftpServer=releaseConfig['ftpServer'],
+ marSignatureFormat=releaseConfig.get('marSignatureFormat', 'mar')
)
builders.append({
'name': builderPrefix('%s_build' % platform),
'slavenames': pf['slaves'],
'category': builderPrefix(''),
'builddir': builderPrefix('%s_build' % platform),
'slavebuilddir': normalizeName(builderPrefix('%s_build' % platform), releaseConfig['productName']),