Permalink
Browse files

changeset: 1581:babffe125f74

parent:      1579:22bbbf5ba66a
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Fri Jun 03 08:37:52 2011 -0400
summary:     bug 658053: update verify config bumper needs to not use pretty versions any more. r=nthomas

changeset:   1582:7d334f66a5ac
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Fri Jun 03 10:18:04 2011 -0400
summary:     bug 656459: use build/tools for staging buildbot-configs. r=aki

changeset:   1583:ea95199dfce9
user:        Aki Sasaki <aki@mozilla.com>
date:        Fri Jun 03 10:23:00 2011 -0400
summary:     bug 637838: Android logs uploaded to the wrong place - change 'stage_product' to 'product' in properties list. r=bhearsum

changeset:   1584:329b837bd034
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Fri Jun 03 11:00:52 2011 -0400
summary:     Bug 659254. Decouple release unit tests logic with new 'enableUnittests' flag. r=nthomas

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 1c1e268 + ad378e9 commit 0b289f3b124002f92d202c4ff7e468081db9d6ef @mozbhearsum mozbhearsum committed Jun 3, 2011
Showing with 28 additions and 25 deletions.
  1. +3 −3 misc.py
  2. +6 −5 process/factory.py
  3. +19 −17 process/release.py
View
6 misc.py
@@ -414,7 +414,7 @@ def generateTestBuilder(config, branch_name, platform, name_prefix,
posixBinarySuffix = '' if 'mobile' in name_prefix else '-bin'
properties = {'branch': branchProperty, 'platform': platform,
'slavebuilddir': 'test', 'stage_platform': stagePlatform,
- 'stage_product': stageProduct}
+ 'product': stageProduct}
if pf.get('is_remote', False):
hostUtils = pf['host_utils_url']
factory = RemoteUnittestFactory(
@@ -2646,7 +2646,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
'branch': branchProperty,
'platform': slave_platform,
'stage_platform': stage_platform,
- 'stage_product': stage_product,
+ 'product': stage_product,
'builddir': builddir,
'slavebuilddir': slavebuilddir,
},
@@ -2782,7 +2782,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
is_try=bool(branch=='try'),
is_shadow=bool(branch=='shadow-central'),
platform_prop='stage_platform',
- product_prop='stage_product')
+ product_prop='product')
branchObjects['status'].append(SubprocessLogHandler(
logUploadCmd,
View
11 process/factory.py
@@ -4529,7 +4529,8 @@ def __init__(self, cvsroot, patcherToolsTag, patcherConfig, verifyConfigs,
mozRepoPath=None, oldRepoPath=None, brandName=None,
buildSpace=22, triggerSchedulers=None, releaseNotesUrl=None,
binaryName=None, oldBinaryName=None, testOlderPartials=False,
- fakeMacInfoTxt=False, **kwargs):
+ fakeMacInfoTxt=False, longVersion=None, oldLongVersion=None,
+ **kwargs):
"""cvsroot: The CVSROOT to use when pulling patcher, patcher-configs,
Bootstrap/Util.pm, and MozBuild. It is also used when
commiting the version-bumped patcher config so it must have
@@ -4590,6 +4591,8 @@ def __init__(self, cvsroot, patcherToolsTag, patcherConfig, verifyConfigs,
self.oldBinaryName = oldBinaryName
self.testOlderPartials = testOlderPartials
self.fakeMacInfoTxt = fakeMacInfoTxt
+ self.longVersion = longVersion or self.version
+ self.oldLongVersion = oldLongVersion or self.oldVersion
self.patcherConfigFile = 'patcher-configs/%s' % patcherConfig
self.shippedLocales = self.getShippedLocales(self.repository, baseTag,
@@ -4968,8 +4971,6 @@ def trigger(self):
))
def getUpdateVerifyBumpCommand(self, platform):
- oldLongVersion = self.makeLongVersion(self.oldVersion)
- longVersion = self.makeLongVersion(self.version)
oldCandidatesDir = self.getCandidatesDir(self.productName,
self.oldVersion,
self.oldBuildNumber)
@@ -4981,9 +4982,9 @@ def getUpdateVerifyBumpCommand(self, platform):
'-r', self.brandName,
'--old-version=%s' % self.oldVersion,
'--old-app-version=%s' % self.oldAppVersion,
- '--old-long-version=%s' % oldLongVersion,
+ '--old-long-version=%s' % self.oldLongVersion,
'-v', self.version, '--app-version=%s' % self.appVersion,
- '--long-version=%s' % longVersion,
+ '--long-version=%s' % self.longVersion,
'-n', str(self.buildNumber), '-a', self.ausServerUrl,
'-s', self.stagingServer, '-c', verifyConfigPath,
'-d', oldCandidatesDir, '-l', 'old-shipped-locales',
View
36 process/release.py
@@ -53,9 +53,9 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
runtimeTag = getRuntimeTag(releaseTag)
l10nChunks = releaseConfig.get('l10nChunks', DEFAULT_PARALLELIZATION)
updateVerifyChunks = releaseConfig.get('updateVerifyChunks', DEFAULT_PARALLELIZATION)
- tools_repo = '%s%s' % (branchConfig['hgurl'],
- releaseConfig.get('build_tools_repo_path',
- branchConfig['build_tools_repo_path']))
+ tools_repo_path = releaseConfig.get('build_tools_repo_path',
+ branchConfig['build_tools_repo_path'])
+ tools_repo = '%s%s' % (branchConfig['hgurl'], tools_repo_path)
config_repo = '%s%s' % (branchConfig['hgurl'],
branchConfig['config_repo_path'])
@@ -507,7 +507,7 @@ def majorUpdateVerifyBuilders(platform):
repository_setup_factory = StagingRepositorySetupFactory(
hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
username=releaseConfig['hgUsername'],
sshKey=releaseConfig['hgSshKey'],
repositories=clone_repositories,
@@ -595,7 +595,7 @@ def majorUpdateVerifyBuilders(platform):
env=pf['env'],
objdir=pf['platform_objdir'],
hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
repoPath=sourceRepoInfo['path'],
productName=releaseConfig['productName'],
version=releaseConfig['version'],
@@ -630,7 +630,7 @@ def majorUpdateVerifyBuilders(platform):
env=pf['env'],
objdir=pf['platform_objdir'],
hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
repoPath=sourceRepoInfo['path'],
productName='xulrunner',
version=releaseConfig['milestone'],
@@ -679,7 +679,7 @@ def majorUpdateVerifyBuilders(platform):
else:
talosMasters = None
- if platform in releaseConfig['unittestPlatforms']:
+ if releaseConfig['enableUnittests']:
packageTests = True
unittestMasters = branchConfig['unittest_masters']
unittestBranch = builderPrefix('%s-opt-unittest' % platform)
@@ -695,7 +695,7 @@ def majorUpdateVerifyBuilders(platform):
platform=platform,
hgHost=branchConfig['hghost'],
repoPath=sourceRepoInfo['path'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
configRepoPath=branchConfig['config_repo_path'],
configSubDir=branchConfig['config_subdir'],
profiledBuild=pf['profiled_build'],
@@ -825,7 +825,7 @@ def majorUpdateVerifyBuilders(platform):
platform=platform,
hgHost=branchConfig['hghost'],
repoPath=sourceRepoInfo['path'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
configRepoPath=branchConfig['config_repo_path'],
configSubDir=branchConfig['config_subdir'],
profiledBuild=None,
@@ -872,7 +872,7 @@ def majorUpdateVerifyBuilders(platform):
partner_repack_factory = PartnerRepackFactory(
hgHost=branchConfig['hghost'],
repoPath=sourceRepoInfo['path'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
productName=releaseConfig['productName'],
version=releaseConfig['version'],
buildNumber=releaseConfig['buildNumber'],
@@ -904,7 +904,7 @@ def majorUpdateVerifyBuilders(platform):
for platform in releaseConfig['l10nPlatforms']:
l10n_verification_factory = L10nVerifyFactory(
hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
cvsroot=releaseConfig['cvsroot'],
stagingServer=releaseConfig['stagingServer'],
productName=releaseConfig['productName'],
@@ -937,7 +937,7 @@ def majorUpdateVerifyBuilders(platform):
updates_factory = ReleaseUpdatesFactory(
hgHost=branchConfig['hghost'],
repoPath=sourceRepoInfo['path'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
cvsroot=releaseConfig['cvsroot'],
patcherToolsTag=releaseConfig['patcherToolsTag'],
patcherConfig=releaseConfig['patcherConfig'],
@@ -973,6 +973,8 @@ def majorUpdateVerifyBuilders(platform):
binaryName=releaseConfig['binaryName'],
oldBinaryName=releaseConfig['oldBinaryName'],
testOlderPartials=releaseConfig['testOlderPartials'],
+ longVersion=releaseConfig.get('longVersion', None),
+ oldLongVersion=releaseConfig.get('oldLongVersion', None)
)
builders.append({
@@ -1097,7 +1099,7 @@ def majorUpdateVerifyBuilders(platform):
final_verification_factory = ReleaseFinalVerification(
hgHost=branchConfig['hghost'],
platforms=[platform],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
verifyConfigs=releaseConfig['verifyConfigs'],
clobberURL=branchConfig['base_clobber_url'],
)
@@ -1134,7 +1136,7 @@ def majorUpdateVerifyBuilders(platform):
major_update_factory = MajorUpdateFactory(
hgHost=branchConfig['hghost'],
repoPath=releaseConfig['majorUpdateRepoPath'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
cvsroot=releaseConfig['cvsroot'],
patcherToolsTag=releaseConfig['majorPatcherToolsTag'],
patcherConfig=releaseConfig['majorUpdatePatcherConfig'],
@@ -1230,7 +1232,7 @@ def majorUpdateVerifyBuilders(platform):
oldVersion=releaseConfig['oldVersion'],
hgHost=branchConfig['hghost'],
repoPath=sourceRepoInfo['path'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
credentialsFile=os.path.join(os.getcwd(), "BuildSlaves.py")
)
@@ -1261,7 +1263,7 @@ def majorUpdateVerifyBuilders(platform):
oldVersion=None, # no updates
hgHost=branchConfig['hghost'],
repoPath=sourceRepoInfo['path'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
+ buildToolsRepoPath=tools_repo_path,
credentialsFile=os.path.join(os.getcwd(), "BuildSlaves.py"),
)
@@ -1358,7 +1360,7 @@ def majorUpdateVerifyBuilders(platform):
builders.extend(test_builders)
logUploadCmd = makeLogUploadCommand(sourceRepoInfo['name'], branchConfig,
- platform_prop=None)
+ platform_prop=None, product=releaseConfig['productName'])
status.append(SubprocessLogHandler(
logUploadCmd + [

0 comments on commit 0b289f3

Please sign in to comment.