Skip to content
This repository has been archived by the owner on Jun 11, 2019. It is now read-only.

Commit

Permalink
Merging from default
Browse files Browse the repository at this point in the history 
changeset:   1756:69709adc605f
tag:         tip
parent:      1755:4d9e3e2224d2
parent:      1753:1b75c6506891
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Sep 01 11:38:01 2011 -0400
summary:     Merge production-0.8 to default to sync up

--HG--
branch : production-0.8
  • Loading branch information
Mike Taylor committed Sep 1, 2011
2 parents 36714ba + 12838e6 commit ad8f2fd
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 102 deletions.
6 changes: 4 additions & 2 deletions bin/try_mailer.py
View file
Expand Up @@ -112,7 +112,7 @@ def makeTryMessage(build, log_url):
log_url = log_url.replace('://stage', '://ftp')
text += "The full log for this %(task)s run is available at <a href=\"%(log_url)s\">%(log_url)s</a>.\n" % locals()
else:
text += "Please check <a href=\"http://tbpl.allizom.org/?tree=Try&usebuildbot=1&rev=%(revision)s\">Tinderbox Pushlog</a> for your logs.\n" % locals()
text += "Please check <a href=\"https://tbpl.mozilla.org/?tree=Try&usebuildbot=1&rev=%(revision)s\">Tinderbox Pushlog</a> for your logs.\n" % locals()

text = re.sub("\n", "<br>\n", text)

Expand Down Expand Up @@ -187,7 +187,9 @@ def formatMessage(msgdict, from_, to):
# else default is failures only
msgdict = None
# Generate the message
if not tm_options.silence:
if tm_options.silence:
print "No email going out for this result: %s (silence=%s)" % (result, tm_options.silence)
else:
if tm_options.all_emails:
msgdict = makeTryMessage(build, log_url)
else:
Expand Down
1 change: 0 additions & 1 deletion common.py
View file
Expand Up @@ -37,7 +37,6 @@ def reallyShort(name):
'central': 'cen',
'1.9.1': '191',
'1.9.2': '192',
'tracemonkey': 'tm',
'places': 'plc',
'electrolysis': 'e10s',
'jaegermonkey': 'jm',
Expand Down
9 changes: 8 additions & 1 deletion misc.py
View file
Expand Up @@ -545,7 +545,7 @@ def generateCCTestBuilder(config, branch_name, platform, name_prefix,

def generateBranchObjects(config, name):
"""name is the name of branch which is usually the last part of the path
to the repository. For example, 'mozilla-central', 'tracemonkey', or
to the repository. For example, 'mozilla-central', 'mozilla-aurora', or
'mozilla-1.9.1'.
config is a dictionary containing all of the necessary configuration
information for a branch. The required keys depends greatly on what's
Expand Down Expand Up @@ -2845,6 +2845,8 @@ def generateFuzzingObjects(config, SLAVES):

def generateNanojitObjects(config, SLAVES):
builders = []
branch = os.path.basename(config['repo_path'])

for platform in config['platforms']:
if 'win' in platform:
slaves = SLAVES[platform]
Expand Down Expand Up @@ -2872,6 +2874,7 @@ def generateNanojitObjects(config, SLAVES):
'nextSlave': _nextSlowIdleSlave(config['idle_slaves']),
'factory': f,
'category': 'idle',
'properties': {'branch': branch},
}
builders.append(builder)
nomergeBuilders.append(builder)
Expand Down Expand Up @@ -2913,6 +2916,8 @@ def generateNanojitObjects(config, SLAVES):

def generateValgrindObjects(config, slaves):
builders = []
branch = os.path.basename(config['repo_path'])

for platform in config['platforms']:
f = ScriptFactory(
config['scripts_repo'],
Expand All @@ -2927,6 +2932,7 @@ def generateValgrindObjects(config, slaves):
'factory': f,
'category': 'idle',
'env': env,
'properties': {'branch': branch},
}
builders.append(builder)

Expand Down Expand Up @@ -2992,6 +2998,7 @@ def generateSpiderMonkeyObjects(config, SLAVES):
'factory': f,
'category': 'idle',
'env': config['env'][platform],
'properties': {'branch': branch},
}
builders.append(builder)

Expand Down
17 changes: 14 additions & 3 deletions process/factory.py
View file
Expand Up @@ -1072,6 +1072,11 @@ def addBuildInfoSteps(self):
description=['getting', 'sourcestamp'],
descriptionDone=['got', 'sourcestamp']
))
self.addStep(SetBuildProperty(
name='set_comments',
property_name="comments",
value=lambda build:(build.source.changes[-1].comments),
))
self._gotBuildInfo = True

def addBuildAnalysisSteps(self):
Expand Down Expand Up @@ -1937,6 +1942,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
revision=WithProperties('%(got_revision)s'),
files=[WithProperties('%(packageUrl)s')],
user=WithProperties('%(who)s'),
comments=WithProperties('%(comments)s'),
sendchange_props=sendchange_props,
))
for master, warn, retries in self.unittestMasters:
Expand All @@ -1950,6 +1956,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
files=[WithProperties('%(packageUrl)s'),
WithProperties('%(testsUrl)s')],
user=WithProperties('%(who)s'),
comments=WithProperties('%(comments)s'),
sendchange_props=sendchange_props,
))

Expand Down Expand Up @@ -2193,8 +2200,8 @@ def addCreatePartialUpdateSteps(self, extraArgs=None):
WithProperties('ssh -l %s -i ~/.ssh/%s %s ' % (self.stageUsername,
self.stageSshKey,
self.stageServer) +
'ls -1t %s | grep %s' % (self.latestDir,
marPattern))
'ls -1t %s | grep %s | head -n 1' % (self.latestDir,
marPattern))
],
extract_fn=marFilenameToProperty(prop_name='previousMarFilename'),
flunkOnFailure=False,
Expand Down Expand Up @@ -2511,6 +2518,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
revision=WithProperties("%(got_revision)s"),
files=[WithProperties('%(packageUrl)s')],
user="sendchange",
comments=WithProperties('%(comments)s'),
sendchange_props=sendchange_props,
))

Expand All @@ -2528,6 +2536,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
revision=WithProperties("%(got_revision)s"),
files=files,
user="sendchange-unittest",
comments=WithProperties('%(comments)s'),
sendchange_props=sendchange_props,
))

Expand Down Expand Up @@ -2688,6 +2697,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
revision=WithProperties("%(got_revision)s"),
files=[WithProperties('%(packageUrl)s')],
user="sendchange",
comments=WithProperties('%(comments)s'),
sendchange_props=sendchange_props,
))

Expand All @@ -2702,6 +2712,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
files=[WithProperties('%(packageUrl)s'),
WithProperties('%(testsUrl)s')],
user="sendchange-unittest",
comments=WithProperties('%(comments)s'),
sendchange_props=sendchange_props,
))

Expand Down Expand Up @@ -5527,7 +5538,7 @@ def doUpload(self):
revision=WithProperties('%(got_revision)s'),
branch=self.unittestBranch,
files=[WithProperties('%(packageUrl)s')],
user=WithProperties('%(who)s'))
user=WithProperties('%(who)s')),
)

class CCUnittestBuildFactory(MozillaBuildFactory):
Expand Down
96 changes: 1 addition & 95 deletions status/generators.py
View file
Expand Up @@ -13,7 +13,7 @@ def buildTryChangeMessage(change, packageDir):
msgdict["body"] = """\
Thanks for your try submission (http://hg.mozilla.org/try/pushloghtml?changeset=%(revision)s). It's the best!
Watch http://tbpl.allizom.org/?tree=Try&usebuildbot=1&rev=%(revision)s for your results to come in.
Watch https://tbpl.mozilla.org/?tree=Try&usebuildbot=1&rev=%(revision)s for your results to come in.
Builds and logs will be available at %(packageDir)s.
Expand All @@ -22,98 +22,4 @@ def buildTryChangeMessage(change, packageDir):

return msgdict

def buildTryCompleteMessage(attrs, packageDir, tinderboxTree):
platform = ''
task = ''
got_revision = ''
who = ''
builder = attrs['builderName']

try:
got_revision = attrs['buildProperties']['got_revision']
except KeyError:
try:
got_revision = attrs['buildProperties']['revision']
except KeyError:
got_revision = 'revision-not-set'
try:
who = attrs['buildProperties']['who']
except KeyError:
who = 'who-not-set'

if 'Linux x86-64' in builder:
platform = 'linux64'
elif 'Linux' in builder:
platform = 'linux'
elif 'OS X 10.6' in builder:
platform = 'mac64'
elif 'OS X 10.5' in builder:
platform = 'mac'
elif 'WINNT 5.2' in builder:
platform = 'win32'
elif 'WINNT 6.1' in builder:
platform = 'win64'
elif 'Maemo' in builder:
platform = 'maemo'

if 'test' in builder:
task = 'test'
elif 'talos' in builder:
task = 'talos'
else:
task = 'build'

url = packageDir % locals()

if attrs['result'] == 'success':
text = """\
Your Try Server %(task)s (%(got_revision)s) was successfully completed on \
%(platform)s on builder: %(builder)s.\n\n""" % locals()
elif attrs['result'] == 'warnings':
text = """\
Your Try Server %(task)s (%(got_revision)s) completed with warnings on \
%(platform)s on builder: %(builder)s.\n\n""" % locals()
elif attrs['result'] == 'exception':
text = """\
Your Try Server %(task)s (%(got_revision)s) hit an exception on \
%(platform)s on builder: %(builder)s.\n\n""" % locals()
elif attrs['result'] == 'failure':
text = """\
Your Try Server %(task)s (%(got_revision)s) failed to complete on \
%(platform)s on builder: %(builder)s.\n\n""" % locals()
else:
text = """\
Unknown issues arose during %(task)s (%(got_revision)s) on \
%(platform)s on builder: %(builder)s. Check with RelEng if you have questions.\n\n""" % locals()

if attrs['result'] in ('success', 'warnings') and packageDir and 'who-not-set' not in who:
text += "It should be available for download at %(url)s\n\n" % locals()
if attrs['result'] in ('failure', 'exception') and 'who-not-set' not in who:
text += "While some of the build steps haven't succeeded, your build package might have been \
successfully created and could be available for download at %(url)s\n\n" % locals()

if task == 'test':
text += "Summary of test results:\n"
for log in attrs['logs']:
if 'summary' not in log[0]:
continue
summary = ''.join(log[2]).replace('TinderboxPrint: ', '')
summary = summary.replace('<br/>', ': ')
text += '%s\n' % summary
text += '\n'

elif task == 'talos':
text += "Summary of talos results:\n"
for log in attrs['logs']:
if 'summary' not in log[0]:
continue
for line in log[2]:
test = re.search("(\w+): ([0-9.:]+)", line)
if test:
text += "%s\n" % (test.group(0))
text += '\n'

text += """Visit http://tbpl.allizom.org/?tree=%(tinderboxTree)s&usebuildbot=1&rev=%(revision)s to view the full logs.""" % locals()

return (text, 'plain')

0 comments on commit ad8f2fd

Please sign in to comment.