Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge to production

changeset:   1852:ce8d3fcfd9c4
user:        Justin Wood <Callek@gmail.com>
description:
No Bug, do compare_attrs better for DependentL10n, so we don't throw in dump_masters. Will followup later to get compare_attrs better for all of buildbotcustom
Not used for Firefox builds, so NPOTB

changeset:   1854:f71f88ea9719
user:        John Ford <jhford@mozilla.com>
description:
bug 693686 - PGO talos builds reporting to Non-PGO branches r=armenzg

changeset:   1855:9f923a8e415c
user:        Lukas Blakk <lsblakk@mozilla.com>
description:
Bug 693794 remove unneeded usebuildbot=1 from tbpl links in try emails p=lsblakk r=jhford

--HG--
branch : production-0.8
  • Loading branch information...
commit 91d5485bcd2c4ac2ae70755ed70096796ee23968 2 parents eae891b + 70e9b95
@nthomas-mozilla nthomas-mozilla authored
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=\"https://tbpl.mozilla.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&rev=%(revision)s\">Tinderbox Pushlog</a> for your logs.\n" % locals()
text = re.sub("\n", "<br>\n", text)
View
2  l10n.py
@@ -202,7 +202,7 @@ class DependentL10n(Dependent, L10nMixin):
'upstream' scheduler has completed successfully.
"""
- compare_attrs = ('name', 'upstream', 'builders')
+ compare_attrs = Dependent.compare_attrs[:]
def __init__(self, name, upstream, builderNames, **kwargs):
Dependent.__init__(self, name, upstream, builderNames)
View
4 misc.py
@@ -2666,7 +2666,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
# We only want to append '-Non-PGO' to platforms that
# also have PGO builds.
- if not platform in branch_config.get('pgo_platforms', []):
+ if not platform in branch_config.get('pgo_platforms', []) or not branch_config.get('add_pgo_builders'):
opt_branch_name = branchName
opt_talos_branch = talosBranch
else:
@@ -2708,6 +2708,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
'slavebuilddir': slavebuilddir,
},
}
+
if not merge:
nomergeBuilders.append(builder['name'])
@@ -2719,6 +2720,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
if do_pgo:
pgo_factory_kwargs = factory_kwargs.copy()
pgo_factory_kwargs['branchName'] = branchName
+ pgo_factory_kwargs['talosBranch'] = talosBranch
pgo_factory = factory_class(**pgo_factory_kwargs)
pgo_builder = {
'name': "%s %s pgo talos %s" % (platform_name, branch, suite),
View
2  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 https://tbpl.mozilla.org/?tree=Try&usebuildbot=1&rev=%(revision)s for your results to come in.
+Watch https://tbpl.mozilla.org/?tree=Try&rev=%(revision)s for your results to come in.
Builds and logs will be available at %(packageDir)s.
Please sign in to comment.
Something went wrong with that request. Please try again.