Bug 1535171 - fix missed uses of no-argument get_root_url r=tomprince
authorDustin J. Mitchell <dustin@mozilla.com>
Wed, 13 Mar 2019 23:10:16 +0000
changeset 521802 2f4101ab87c7
parent 521801 0806b7256605
child 521803 08d0bcbb20e3
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1535171
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1535171 - fix missed uses of no-argument get_root_url r=tomprince Differential Revision: https://phabricator.services.mozilla.com/D23416
mobile/android/mach_commands.py
python/mozrelease/mozrelease/buglist_creator.py
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -50,17 +50,17 @@ def REMOVED(cls):
 @CommandProvider
 class MachCommands(MachCommandBase):
     def _root_url(self, artifactdir=None, objdir=None):
         """Generate a publicly-accessible URL for the tasks's artifacts, or an objdir path"""
         if 'TASK_ID' in os.environ and 'RUN_ID' in os.environ:
             import taskcluster_urls
             from taskgraph.util.taskcluster import get_root_url
             return taskcluster_urls.api(
-                get_root_url(), 'queue', 'v1', 'task/{}/runs/{}/artifacts/{}'.format(
+                get_root_url(False), 'queue', 'v1', 'task/{}/runs/{}/artifacts/{}'.format(
                     os.environ['TASK_ID'], os.environ['RUN_ID'], artifactdir))
         else:
             return os.path.join(self.topobjdir, objdir)
 
     @Command('android', category='devenv',
              description='Run Android-specific commands.',
              conditions=[conditions.is_android])
     def android(self):
--- a/python/mozrelease/mozrelease/buglist_creator.py
+++ b/python/mozrelease/mozrelease/buglist_creator.py
@@ -213,18 +213,17 @@ Task group: [{task_group_id}](https://to
     subject_prefix = ""
     if product in {"fennec"}:
         subject_prefix = "[mobile] "
     if product in {"firefox", "devedition"}:
         subject_prefix = "[desktop] "
 
     subject = '{} Build of {} {} build {}'.format(subject_prefix, product, version, build_number)
 
-    notify_options = optionsFromEnvironment({'rootUrl': get_root_url()})
-    if 'TASKCLUSTER_PROXY_URL' in os.environ:
-        notify_options['rootUrl'] = os.environ['TASKCLUSTER_PROXY_URL']
+    use_proxy = 'TASKCLUSTER_PROXY_URL' in os.environ
+    notify_options = optionsFromEnvironment({'rootUrl': get_root_url(use_proxy)})
     notify = Notify(notify_options)
     for address in addresses:
         notify.email({
             'address': address,
             'subject': subject,
             'content': content,
         })