Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merging from default

changeset:   3111:1873a6c65831
tag:         tip
parent:      3108:bff9a24edcf1
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Mon Apr 15 10:20:54 2013 -0400
summary:     bug 859464: merge final verify builders together. r=rail

--HG--
branch : production-0.8
  • Loading branch information...
commit 5238e76e7dfe5e7697085e0c37221ef7cab2e680 2 parents 26c7089 + 954570a
@ccooper ccooper authored
Showing with 7 additions and 9 deletions.
  1. +7 −9 process/release.py
View
16 process/release.py
@@ -1465,10 +1465,9 @@ def getMessageId():
},
})
- for platform in releaseConfig.get('verifyConfigs', {}).keys():
+ if releaseConfig.get('verifyConfigs'):
final_verification_factory = ReleaseFinalVerification(
hgHost=branchConfig['hghost'],
- platforms=[platform],
buildToolsRepoPath=tools_repo_path,
verifyConfigs=releaseConfig['verifyConfigs'],
clobberURL=clobberer_url,
@@ -1477,17 +1476,17 @@ def getMessageId():
)
builders.append({
- 'name': builderPrefix('final_verification', platform),
+ 'name': builderPrefix('final_verification'),
'slavenames': branchConfig['platforms']['linux']['slaves'] +
branchConfig['platforms']['linux64']['slaves'],
'category': builderPrefix(''),
- 'builddir': builderPrefix('final_verification', platform),
- 'slavebuilddir': normalizeName(builderPrefix('fnl_verf', platform), releaseConfig['productName']),
+ 'builddir': builderPrefix('final_verification'),
+ 'slavebuilddir': normalizeName(builderPrefix('fnl_verf'), releaseConfig['productName']),
'factory': final_verification_factory,
'nextSlave': _nextFastSlave,
'env': builder_env,
'properties': {
- 'slavebuilddir': normalizeName(builderPrefix('fnl_verf', platform), releaseConfig['productName']),
+ 'slavebuilddir': normalizeName(builderPrefix('fnl_verf'), releaseConfig['productName']),
'platform': None,
'branch': 'release-%s' % sourceRepoInfo['name'],
},
@@ -1727,9 +1726,8 @@ def getMessageId():
if releaseConfig.get('verifyConfigs'):
readyForReleaseUpstreams += post_update_builders
finalVerifyBuilders = []
- for platform in releaseConfig['verifyConfigs'].keys():
- finalVerifyBuilders.append(
- builderPrefix('final_verification', platform))
+ if releaseConfig.get('verifyConfigs'):
+ finalVerifyBuilders = [builderPrefix('final_verification')]
readyForReleaseUpstreams += finalVerifyBuilders
mirror_scheduler1 = TriggerBouncerCheck(
Please sign in to comment.
Something went wrong with that request. Please try again.