Skip to content

Commit

Permalink
Bug 1787431 - Use canonical treeherder URLs. r=sheehan
Browse files Browse the repository at this point in the history
Differential Revision: https://phabricator.services.mozilla.com/D155701

--HG--
extra : moz-landing-system : lando
  • Loading branch information
emilio committed Aug 26, 2022
1 parent 361e422 commit d0323cf
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion hgext/hgmo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def backoutsgen(_context):
# with.
treeherder = repo.ui.config(b'mozilla', b'treeherder_repo')
if treeherder:
d[b'treeherderrepourl'] = b'https://treeherder.mozilla.org/#/jobs?repo=%s' % treeherder
d[b'treeherderrepourl'] = b'https://treeherder.mozilla.org/jobs?repo=%s' % treeherder
d[b'treeherderrepo'] = treeherder

push = repo.pushlog.pushfromchangeset(ctx)
Expand Down
6 changes: 3 additions & 3 deletions hgext/hgmo/tests/test-treeherder.t
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Treeherder link but no perfherder link if non-publishing phase and not autoland
$ cd ..
$ http http://localhost:$HGPORT2/rev/be788785547b --body-file body > /dev/null
$ grep '>treeherder' body
<tr><td>treeherder</td><td>try@0a37bfb47d98 [<a href="https://treeherder.mozilla.org/#/jobs?repo=try&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e">default view</a>] [<a href="https://treeherder.mozilla.org/#/jobs?repo=try&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception">failures only]</td></tr>
<tr><td>treeherder</td><td>try@0a37bfb47d98 [<a href="https://treeherder.mozilla.org/jobs?repo=try&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e">default view</a>] [<a href="https://treeherder.mozilla.org/jobs?repo=try&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception">failures only]</td></tr>
$ grep perfherder body
[1]
Expand All @@ -70,7 +70,7 @@ Treeherder link and perfherder link if non-publishing phase and autoland
$ cd ..
$ http http://localhost:$HGPORT3/rev/be788785547b --body-file body > /dev/null
$ grep '>treeherder' body
<tr><td>treeherder</td><td>autoland@0a37bfb47d98 [<a href="https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e">default view</a>] [<a href="https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception">failures only]</td></tr>
<tr><td>treeherder</td><td>autoland@0a37bfb47d98 [<a href="https://treeherder.mozilla.org/jobs?repo=autoland&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e">default view</a>] [<a href="https://treeherder.mozilla.org/jobs?repo=autoland&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception">failures only]</td></tr>
$ grep perfherder body
<tr><td>perfherder</td><td>[<a href="https://treeherder.mozilla.org/perf.html#/compare?originalProject=autoland&originalRevision=0a37bfb47d9849cceb609070a69c0715a176dd3e&newProject=autoland&newRevision=be788785547b64e986e9f219500f5f6d31de39b5&framework=1" target="_blank">talos</a>] [<a href="https://treeherder.mozilla.org/perf.html#/compare?originalProject=autoland&originalRevision=0a37bfb47d9849cceb609070a69c0715a176dd3e&newProject=autoland&newRevision=be788785547b64e986e9f219500f5f6d31de39b5&framework=2" target="_blank">build metrics</a>] [<a href="https://treeherder.mozilla.org/perf.html#/compare?originalProject=autoland&originalRevision=0a37bfb47d9849cceb609070a69c0715a176dd3e&newProject=autoland&newRevision=be788785547b64e986e9f219500f5f6d31de39b5&framework=6" target="_blank">platform microbench</a>] (compared to previous push)</td></tr>
Expand All @@ -95,7 +95,7 @@ Treeherder link and perfherder link if publishing phase
$ cd ..
$ http http://localhost:$HGPORT4/rev/be788785547b --body-file body > /dev/null
$ grep '>treeherder' body
<tr><td>treeherder</td><td>mozilla-central@0a37bfb47d98 [<a href="https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e">default view</a>] [<a href="https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception">failures only]</td></tr>
<tr><td>treeherder</td><td>mozilla-central@0a37bfb47d98 [<a href="https://treeherder.mozilla.org/jobs?repo=mozilla-central&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e">default view</a>] [<a href="https://treeherder.mozilla.org/jobs?repo=mozilla-central&revision=0a37bfb47d9849cceb609070a69c0715a176dd3e&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception">failures only]</td></tr>
$ grep perfherder body
<tr><td>perfherder</td><td>[<a href="https://treeherder.mozilla.org/perf.html#/compare?originalProject=mozilla-central&originalRevision=0a37bfb47d9849cceb609070a69c0715a176dd3e&newProject=mozilla-central&newRevision=be788785547b64e986e9f219500f5f6d31de39b5&framework=1" target="_blank">talos</a>] [<a href="https://treeherder.mozilla.org/perf.html#/compare?originalProject=mozilla-central&originalRevision=0a37bfb47d9849cceb609070a69c0715a176dd3e&newProject=mozilla-central&newRevision=be788785547b64e986e9f219500f5f6d31de39b5&framework=2" target="_blank">build metrics</a>] [<a href="https://treeherder.mozilla.org/perf.html#/compare?originalProject=mozilla-central&originalRevision=0a37bfb47d9849cceb609070a69c0715a176dd3e&newProject=mozilla-central&newRevision=be788785547b64e986e9f219500f5f6d31de39b5&framework=6" target="_blank">platform microbench</a>] (compared to previous push)</td></tr>
Expand Down
2 changes: 1 addition & 1 deletion hgext/mozext/tests/test-mozext.t
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ Show the dag
{firstpushtreeherder} template works
$ hg log -r 4 --template '{firstpushtreeherder}\n'
https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=d6d34e5ea05c48d5ae40f6f3d73beae8babe509c
https://treeherder.mozilla.org/jobs?repo=mozilla-central&revision=d6d34e5ea05c48d5ae40f6f3d73beae8babe509c
{pushdates} template works
Expand Down
6 changes: 3 additions & 3 deletions hghooks/mozhghooks/push_printurls.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def hook(ui, repo, node, hooktype, source=None, **kwargs):
if treeherder_repo:
treeherder_base_url = b'https://treeherder.mozilla.org'
ui.write(b'\nFollow the progress of your build on Treeherder:\n')
ui.write(b' %s/#/jobs?repo=%s&revision=%s\n' % (treeherder_base_url,
treeherder_repo,
tip_node))
ui.write(b' %s/jobs?repo=%s&revision=%s\n' % (treeherder_base_url,
treeherder_repo,
tip_node))
# if specifying a try build and talos jobs are enabled, suggest that
# user use compareperf
if treeherder_repo == b'try':
Expand Down
14 changes: 7 additions & 7 deletions hghooks/tests/test-push_printurls.t
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Push a single changeset to a non-try repo print the URL
https://hg.mozilla.org/integration/mozilla-inbound/rev/3d7d3272d708dbf56dab75764495a40032014e3c
Follow the progress of your build on Treeherder:
https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=3d7d3272d708dbf56dab75764495a40032014e3c
https://treeherder.mozilla.org/jobs?repo=mozilla-inbound&revision=3d7d3272d708dbf56dab75764495a40032014e3c
added 1 changesets with 1 changes to 1 files
Pushing a changeset to Try prints Treeherder URLs
Expand All @@ -64,7 +64,7 @@ Pushing a changeset to Try prints Treeherder URLs
https://hg.mozilla.org/try/rev/3d7d3272d708dbf56dab75764495a40032014e3c
Follow the progress of your build on Treeherder:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=3d7d3272d708dbf56dab75764495a40032014e3c
https://treeherder.mozilla.org/jobs?repo=try&revision=3d7d3272d708dbf56dab75764495a40032014e3c
added 1 changesets with 1 changes to 1 files
Expand All @@ -83,7 +83,7 @@ Pushing a changeset to Try with talos jobs prints a link to perfherder...
https://hg.mozilla.org/try/rev/083142255559ec6a2b4f78157c1ea522e6fd9722
Follow the progress of your build on Treeherder:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=083142255559ec6a2b4f78157c1ea522e6fd9722
https://treeherder.mozilla.org/jobs?repo=try&revision=083142255559ec6a2b4f78157c1ea522e6fd9722
It looks like this try push has talos jobs. Compare performance against a baseline revision:
https://treeherder.mozilla.org/perf.html#/comparechooser?newProject=try&newRevision=083142255559ec6a2b4f78157c1ea522e6fd9722
Expand All @@ -105,7 +105,7 @@ and doesn't when it doesn't
https://hg.mozilla.org/try/rev/7d0edcba6d851680f3cc8730ca2e32f5fb8177a7
Follow the progress of your build on Treeherder:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=7d0edcba6d851680f3cc8730ca2e32f5fb8177a7
https://treeherder.mozilla.org/jobs?repo=try&revision=7d0edcba6d851680f3cc8730ca2e32f5fb8177a7
added 1 changesets with 1 changes to 1 files
Expand All @@ -124,7 +124,7 @@ try-comm-central is also special
https://hg.mozilla.org/try-comm-central/rev/7d0edcba6d851680f3cc8730ca2e32f5fb8177a7
Follow the progress of your build on Treeherder:
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=7d0edcba6d851680f3cc8730ca2e32f5fb8177a7
https://treeherder.mozilla.org/jobs?repo=try-comm-central&revision=7d0edcba6d851680f3cc8730ca2e32f5fb8177a7
added 3 changesets with 3 changes to 1 files
Push multiple changesets to a non-try repo
Expand All @@ -147,7 +147,7 @@ Push multiple changesets to a non-try repo
https://hg.mozilla.org/integration/mozilla-inbound/rev/b404b501615bd72a0bfbb905e636c2f1fcf110da
Follow the progress of your build on Treeherder:
https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=b404b501615bd72a0bfbb905e636c2f1fcf110da
https://treeherder.mozilla.org/jobs?repo=mozilla-inbound&revision=b404b501615bd72a0bfbb905e636c2f1fcf110da
added 4 changesets with 4 changes to 1 files
Push a lot of changesets to a non-try repo
Expand All @@ -164,6 +164,6 @@ Push a lot of changesets to a non-try repo
https://hg.mozilla.org/integration/mozilla-inbound/pushloghtml?changeset=78d884a7fbe7948375d29b261a92a948dea508db
Follow the progress of your build on Treeherder:
https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=78d884a7fbe7948375d29b261a92a948dea508db
https://treeherder.mozilla.org/jobs?repo=mozilla-inbound&revision=78d884a7fbe7948375d29b261a92a948dea508db
added 21 changesets with 21 changes to 1 files
2 changes: 1 addition & 1 deletion pylib/mozautomation/mozautomation/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def treeherder_url(tree, rev):
if not tree:
return None

return b'https://treeherder.mozilla.org/#/jobs?repo=%s&revision=%s' % (tree, rev)
return b'https://treeherder.mozilla.org/jobs?repo=%s&revision=%s' % (tree, rev)


class PushInfo(object):
Expand Down

0 comments on commit d0323cf

Please sign in to comment.