Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bug 683430 switch try emails to new tbpl url p=lsblakk r=catlee

  • Loading branch information...
commit 3027b7cbd5afbcd6a389ed8dacddc329cb3cc563 1 parent e72cf6a
@lsblakk lsblakk authored
Showing with 2 additions and 96 deletions.
  1. +1 −1  bin/try_mailer.py
  2. +1 −95 status/generators.py
View
2  bin/try_mailer.py
@@ -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)
View
96 status/generators.py
@@ -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.
@@ -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')
Please sign in to comment.
Something went wrong with that request. Please try again.