Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

changeset: 2410:2945a9b02531

parent:      2408:25e2e6a5682f
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Fri Jun 08 16:59:36 2012 -0400
summary:     Bug 712630. Run mouse_and_screen_resolution.py on Windows test jobs. r=coop

changeset:   2411:86dd2d12fa51
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Jun 11 08:37:55 2012 -0400
summary:     Bug 760389 - Clobber doesn't work for some release builders. r=bhearsum

--HG--
branch : production-0.8
  • Loading branch information...
commit e51014d629d0952afa19c2a98c98032e41a73cac 2 parents 67c9ec1 + 44a6cc1
@armenzg armenzg authored
Showing with 31 additions and 6 deletions.
  1. +22 −6 process/factory.py
  2. +8 −0 process/release.py
  3. +1 −0  status/errors.py
View
28 process/factory.py
@@ -387,11 +387,11 @@ class MozillaBuildFactory(RequestSortingBuildFactory):
ignore_dirs = [ 'info', 'rel-*']
def __init__(self, hgHost, repoPath, buildToolsRepoPath, buildSpace=0,
- clobberURL=None, clobberTime=None, buildsBeforeReboot=None,
- branchName=None, baseWorkDir='build', hashType='sha512',
- baseMirrorUrls=None, baseBundleUrls=None, signingServers=None,
- enableSigning=True, env={}, balrog_api_root=None,
- balrog_credentials_file=None, **kwargs):
+ clobberURL=None, clobberBranch=None, clobberTime=None,
+ buildsBeforeReboot=None, branchName=None, baseWorkDir='build',
+ hashType='sha512', baseMirrorUrls=None, baseBundleUrls=None,
+ signingServers=None, enableSigning=True, env={},
+ balrog_api_root=None, balrog_credentials_file=None, **kwargs):
BuildFactory.__init__(self, **kwargs)
if hgHost.endswith('/'):
@@ -419,6 +419,10 @@ def __init__(self, hgHost, repoPath, buildToolsRepoPath, buildSpace=0,
self.branchName = branchName
else:
self.branchName = self.getRepoName(self.repository)
+ if not clobberBranch:
+ self.clobberBranch = self.branchName
+ else:
+ self.clobberBranch = clobberBranch
if self.signingServers and self.enableSigning:
self.signing_command = get_signing_cmd(
@@ -483,7 +487,7 @@ def addInitialSteps(self):
if self.clobberURL is not None:
self.addStep(MozillaClobberer(
name='checking_clobber_times',
- branch=self.branchName,
+ branch=self.clobberBranch,
clobber_url=self.clobberURL,
clobberer_path=WithProperties('%(builddir)s/tools/clobberer/clobberer.py'),
clobberTime=self.clobberTime
@@ -6817,6 +6821,18 @@ def addSetupSteps(self):
command=['xset', 's', 'reset'],
env=self.env,
))
+ if self.platform.startswith('win32'):
+ self.addStep(ShellCommand(
+ name='run mouse & screen adjustment script',
+ command=['C:\\mozilla-build\\python25\\python.exe',
+ WithProperties('%(toolsdir)s/scripts/support/mouse_and_screen_resolution.py'),
+ '--configuration-url',
+ WithProperties("http://%s/%s" % (self.hgHost, self.repoPath) + \
+ "/raw-file/%(revision)s/testing/machine-configuration.json")],
+ flunkOnFailure=True,
+ haltOnFailure=True,
+ log_eval_func=lambda c,s: regex_log_evaluator(c, s, global_errors),
+ ))
def addRunTestSteps(self):
if self.platform.startswith('macosx64'):
View
8 process/release.py
@@ -339,6 +339,7 @@ def hasPlatformSubstring(platforms, substring):
sshKey=releaseConfig['hgSshKey'],
repositories=clone_repositories,
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
userRepoRoot=releaseConfig['userRepoRoot'],
)
@@ -468,6 +469,7 @@ def hasPlatformSubstring(platforms, substring):
buildNumber=releaseConfig['buildNumber'],
autoconfDirs=['.', 'js/src'],
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
mozconfig=mozconfig,
configRepoPath=branchConfig['config_repo_path'],
configSubDir=branchConfig['config_subdir'],
@@ -515,6 +517,7 @@ def hasPlatformSubstring(platforms, substring):
buildNumber=releaseConfig['buildNumber'],
autoconfDirs=['.', 'js/src'],
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
mozconfig=mozconfig,
configRepoPath=branchConfig['config_repo_path'],
configSubDir=branchConfig['config_subdir'],
@@ -634,6 +637,7 @@ def hasPlatformSubstring(platforms, substring):
unittestMasters=unittestMasters,
unittestBranch=unittestBranch,
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
triggerBuilds=True,
triggeredSchedulers=triggeredSchedulers,
stagePlatform=buildbot2ftp(platform),
@@ -852,6 +856,7 @@ def hasPlatformSubstring(platforms, substring):
version=releaseConfig['version'],
buildNumber=releaseConfig['buildNumber'],
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
packageSDK=True,
signingServers=getSigningServers(platform),
enableSigning=releaseConfig.get('enableSigningAtBuildTime', True),
@@ -1062,6 +1067,7 @@ def hasPlatformSubstring(platforms, substring):
# commit to
commitPatcherConfig=releaseConfig['commitPatcherConfig'],
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
oldRepoPath=sourceRepoInfo['path'],
releaseNotesUrl=releaseConfig['releaseNotesUrl'],
binaryName=releaseConfig['binaryName'],
@@ -1302,6 +1308,7 @@ def hasPlatformSubstring(platforms, substring):
buildToolsRepoPath=tools_repo_path,
verifyConfigs=releaseConfig['verifyConfigs'],
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
repoPath=sourceRepoInfo['path'],
)
@@ -1380,6 +1387,7 @@ def hasPlatformSubstring(platforms, substring):
# commit to
commitPatcherConfig=releaseConfig['commitPatcherConfig'],
clobberURL=clobberer_url,
+ clobberBranch='release-%s' % sourceRepoInfo['name'],
oldRepoPath=sourceRepoInfo['path'],
triggerSchedulers=[builderPrefix('major_update_verify')],
releaseNotesUrl=releaseConfig['majorUpdateReleaseNotesUrl'],
View
1  status/errors.py
@@ -7,6 +7,7 @@
(re.compile("devicemanager.DMError"), RETRY),
(re.compile("Connection to the other side was lost in a non-clean fashion"), RETRY),
(re.compile("program finished with exit code 80"), RETRY),
+ (re.compile("INFRA-ERROR"), RETRY),
)
hg_errors = ((re.compile("abort: HTTP Error 5\d{2}"), RETRY),
(re.compile("abort: .*: no match found!"), RETRY),
Please sign in to comment.
Something went wrong with that request. Please try again.