Permalink
Browse files

Merge from default

changeset:   1666:407c31d4c137
user:        Rail Aliev <rail@mozilla.com>
date:        Wed Jul 13 11:47:36 2011 +0300
summary:     Bug 574764 - (mobile-0.8-releases) mobile release builders -> buildbot-0.8.0. r=aki

changeset:   1675:4b59cdc14898
tag:         tip
parent:      1666:407c31d4c137
user:        Cameron McCormack <cam@mcc.id.au>
date:        Thu Jul 14 09:28:54 2011 +1200
summary:     Bug 479352 - Set MOZ_HIDE_RESULTS_TABLE=1 when running mochitests. (v3) r=catlee

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 3ffce75 + db6357d commit 177a930489726a04a1dfa7ec66450d6f9a46819d @rail rail committed Jul 13, 2011
Showing with 673 additions and 429 deletions.
  1. +2 −1 bin/log_uploader.py
  2. +1 −0 changes/ftppoller.py
  3. +7 −2 env.py
  4. +7 −0 misc.py
  5. +54 −20 process/factory.py
  6. +586 −403 process/release.py
  7. +16 −3 status/mail.py
View
@@ -247,6 +247,8 @@ def formatLog(tmpdir, build, builder_suffix=''):
buildid = getBuildId(build)
if options.release:
+ if 'mobile' in options.product:
+ uploadArgs['nightly_dir'] = 'candidates'
uploadArgs['to_candidates'] = True
version, buildNumber = options.release.split('/')
uploadArgs['version'] = version
@@ -291,7 +293,6 @@ def formatLog(tmpdir, build, builder_suffix=''):
to_try=False,
who=None,
revision=None,
- builddir=None,
buildid=buildid,
))
post_upload_cmd = postUploadCmdPrefix(**uploadArgs)
View
@@ -75,6 +75,7 @@ def _process_changes(self, pageContents, url):
c = changes.Change(who = url,
comments = "success",
files = [],
+ properties={'who': url},
branch = self.branch)
self.parent.addChange(c)
View
9 env.py
@@ -76,6 +76,7 @@
"NO_FAIL_ON_TEST_ERRORS": '1',
"CCACHE_DIR": '/builds/ccache',
"CCACHE_UMASK": '002',
+ "MOZ_HIDE_RESULTS_TABLE": '1'
}
MozillaEnvironments['linux64-unittest'] = MozillaEnvironments['linux-unittest'].copy()
@@ -87,7 +88,8 @@
"NO_EM_RESTART": '1',
"XPCOM_DEBUG_BREAK": 'warn',
"CVS_RSH": 'ssh',
- "NO_FAIL_ON_TEST_ERRORS": '1'
+ "NO_FAIL_ON_TEST_ERRORS": '1',
+ "MOZ_HIDE_RESULTS_TABLE": '1'
}
MozillaEnvironments['macosx64-unittest'] = MozillaEnvironments['macosx-unittest'].copy()
@@ -114,7 +116,8 @@
"MSVCDir": 'D:\\msvs8\\VC',
"DevEnvDir": "D:\\msvs8\\Common7\\IDE",
"LIBPATH": 'C:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727;' + \
- 'D:\\msvs8\\VC\\ATLMFC\\LIB'
+ 'D:\\msvs8\\VC\\ATLMFC\\LIB',
+ "MOZ_HIDE_RESULTS_TABLE": '1'
}
MozillaEnvironments['win64-unittest'] = {
@@ -124,6 +127,7 @@
"XPCOM_DEBUG_BREAK": 'warn',
"CVS_RSH": 'ssh',
"NO_FAIL_ON_TEST_ERRORS": '1',
+ "MOZ_HIDE_RESULTS_TABLE": '1'
}
### Talos environments
@@ -187,6 +191,7 @@
}
MozillaEnvironments['android-unittest'] = {
+ "MOZ_HIDE_RESULTS_TABLE": '1'
}
MozillaEnvironments['android-perf'] = {
View
@@ -128,6 +128,13 @@ def isImportantL10nFile(change, l10nModules):
return True
return False
+def changeContainsProduct(change, productName):
+ products = change.properties.getProperty("products")
+ if products:
+ if productName in products.split(','):
+ return True
+ return False
+
def generateTestBuilderNames(name_prefix, suites_name, suites):
test_builders = []
if isinstance(suites, dict) and "totalChunks" in suites:
View
@@ -110,6 +110,8 @@ def postUploadCmdPrefix(upload_dir=None,
to_try=False,
to_shadow=False,
to_candidates=False,
+ to_mobile_candidates=False,
+ nightly_dir=None,
as_list=True,
):
"""Returns a post_upload.py command line for the given arguments.
@@ -158,6 +160,10 @@ def postUploadCmdPrefix(upload_dir=None,
cmd.append("--release-to-shadow-central-builds")
if to_candidates:
cmd.append("--release-to-candidates-dir")
+ if to_mobile_candidates:
+ cmd.append("--release-to-mobile-candidates-dir")
+ if nightly_dir:
+ cmd.append("--nightly-dir=%s" % nightly_dir)
if as_list:
return cmd
@@ -185,7 +191,7 @@ def parse_make_upload(rc, stdout, stderr):
retval['symbolsUrl'] = m
elif m.endswith("tests.tar.bz2") or m.endswith("tests.zip"):
retval['testsUrl'] = m
- elif m.endswith("apk") and 'unsigned' in m:
+ elif m.endswith('apk') and 'unsigned-unaligned' in m:
retval['unsignedApkUrl'] = m
elif 'jsshell-' in m and m.endswith('.zip'):
retval['jsshellUrl'] = m
@@ -1445,6 +1451,7 @@ def addUploadSteps(self, pkgArgs=None, pkgTestArgs=None):
command=cmd,
env=pkg_env,
workdir='.',
+ haltOnFailure=True,
))
# We need to set packageFilename to the multi apk
self.addFilePropertiesSteps(filename=packageFilename,
@@ -2544,13 +2551,14 @@ def addUploadSnippetsSteps(self):
class ReleaseBuildFactory(MercurialBuildFactory):
def __init__(self, env, version, buildNumber, brandName=None,
unittestMasters=None, unittestBranch=None, talosMasters=None,
- **kwargs):
+ usePrettyNames=True, enableUpdatePackaging=True, **kwargs):
self.version = version
self.buildNumber = buildNumber
self.talosMasters = talosMasters or []
self.unittestMasters = unittestMasters or []
self.unittestBranch = unittestBranch
+ self.enableUpdatePackaging = enableUpdatePackaging
if self.unittestMasters:
assert self.unittestBranch
@@ -2563,7 +2571,8 @@ def __init__(self, env, version, buildNumber, brandName=None,
env = env.copy()
# Make sure MOZ_PKG_PRETTYNAMES is on and override MOZ_PKG_VERSION
# The latter is only strictly necessary for RCs.
- env['MOZ_PKG_PRETTYNAMES'] = '1'
+ if usePrettyNames:
+ env['MOZ_PKG_PRETTYNAMES'] = '1'
env['MOZ_PKG_VERSION'] = version
MercurialBuildFactory.__init__(self, env=env, **kwargs)
@@ -2574,13 +2583,14 @@ def addFilePropertiesSteps(self, filename=None, directory=None,
def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
# Make sure the complete MAR has been generated
- self.addStep(ShellCommand,
- name='make_update_pkg',
- command=['make', '-C',
- '%s/tools/update-packaging' % self.mozillaObjdir],
- env=self.env,
- haltOnFailure=True
- )
+ if self.enableUpdatePackaging:
+ self.addStep(ShellCommand,
+ name='make_update_pkg',
+ command=['make', '-C',
+ '%s/tools/update-packaging' % self.mozillaObjdir],
+ env=self.env,
+ haltOnFailure=True
+ )
self.addStep(ShellCommand,
name='echo_buildID',
command=['bash', '-c',
@@ -2597,23 +2607,43 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
if self.stageSshKey:
uploadEnv['UPLOAD_SSH_KEY'] = '~/.ssh/%s' % self.stageSshKey
- uploadEnv['POST_UPLOAD_CMD'] = postUploadCmdPrefix(
- product=self.productName,
- version=self.version,
- buildNumber=str(self.buildNumber),
- to_candidates=True,
- as_list=False)
+ uploadArgs = dict(
+ product=self.productName,
+ version=self.version,
+ buildNumber=str(self.buildNumber),
+ as_list=False)
+ upload_vars = []
- self.addStep(RetryingSetProperty(
+ if self.productName == 'fennec':
+ builddir = '%s/en-US' % self.stagePlatform
+ if uploadMulti:
+ builddir = '%s/multi' % self.stagePlatform
+ upload_vars = ['AB_CD=multi']
+ if postUploadBuildDir:
+ builddir = '%s/%s' % (self.stagePlatform, postUploadBuildDir)
+ uploadArgs['builddir'] = builddir
+ uploadArgs['to_mobile_candidates'] = True
+ uploadArgs['nightly_dir'] = 'candidates'
+ uploadArgs['product'] = 'mobile'
+ else:
+ uploadArgs['to_candidates'] = True
+
+ uploadEnv['POST_UPLOAD_CMD'] = postUploadCmdPrefix(**uploadArgs)
+
+ objdir = WithProperties('%(basedir)s/build/' + self.objdir)
+ if self.platform.startswith('win'):
+ objdir = 'build/%s' % self.objdir
+ self.addStep(RetryingScratchboxProperty(
name='make_upload',
- command=['make', 'upload'],
+ command=['make', 'upload'] + upload_vars,
env=uploadEnv,
- workdir='build/%s' % self.objdir,
- extract_fn = parse_make_upload,
+ workdir=objdir,
+ extract_fn=parse_make_upload,
haltOnFailure=True,
description=['upload'],
timeout=60*60, # 60 minutes
log_eval_func=lambda c,s: regex_log_evaluator(c, s, upload_errors),
+ sb=self.use_scratchbox,
))
# Send to the "release" branch on talos, it will do
@@ -4119,10 +4149,14 @@ def __init__(self, productName, version, baseTag, stagingServer,
self.env['MOZ_OBJDIR'] = self.objdir
self.env['MOZ_PKG_PRETTYNAMES'] = '1'
self.env['MOZ_PKG_VERSION'] = version
+ self.env['MOZ_PKG_APPNAME'] = productName
# '-c' is for "release to candidates dir"
postUploadCmd = 'post_upload.py -p %s -v %s -n %s -c' % \
(productName, version, buildNumber)
+ if productName == 'fennec':
+ postUploadCmd = 'post_upload.py -p mobile --nightly-dir candidates -v %s -n %s -c' % \
+ (version, buildNumber)
uploadEnv = {'UPLOAD_HOST': stagingServer,
'UPLOAD_USER': stageUsername,
'UPLOAD_SSH_KEY': '~/.ssh/%s' % stageSshKey,
Oops, something went wrong.

0 comments on commit 177a930

Please sign in to comment.