tor-browser

commit f39c46c151458e5d0106f1e995571421d0db558d
parent 361c34aa2d3abd03c71a1275ba84c354658f2f11
Author: Andrew Halberstadt <ahal@mozilla.com>
Date:   Fri, 24 Oct 2025 07:02:25 +0000

Bug 1996149 - [ci] Fix get_index_url to avoid proxy by default, r=taskgraph-reviewers,jcristau

We'll need to fix this upstream, but until we do that and vendor it, fix
it in gecko_taskgraph for the time being.

Differential Revision: https://phabricator.services.mozilla.com/D269908

Diffstat:
M
taskcluster/gecko_taskgraph/transforms/test/other.py
 | 
6
++----
M
taskcluster/gecko_taskgraph/util/taskcluster.py
 | 
8
++++++++

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/transforms/test/other.py b/taskcluster/gecko_taskgraph/transforms/test/other.py
@@ -13,16 +13,14 @@ from taskgraph.util.attributes import keymatch
 from taskgraph.util.keyed_by import evaluate_keyed_by
 from taskgraph.util.readonlydict import ReadOnlyDict
 from taskgraph.util.schema import Schema, resolve_keyed_by
-from taskgraph.util.taskcluster import (
-    get_artifact_path,
-    get_index_url,
-)
+from taskgraph.util.taskcluster import get_artifact_path
 from taskgraph.util.templates import merge
 from voluptuous import Any, Optional, Required
 
 from gecko_taskgraph.transforms.test.variant import TEST_VARIANTS
 from gecko_taskgraph.util.perftest import is_external_browser
 from gecko_taskgraph.util.platforms import platform_family
+from gecko_taskgraph.util.taskcluster import get_index_url
 
 transforms = TransformSequence()
 
diff --git a/taskcluster/gecko_taskgraph/util/taskcluster.py b/taskcluster/gecko_taskgraph/util/taskcluster.py
@@ -5,6 +5,7 @@
 
 import logging
 
+import taskcluster_urls as liburls
 from taskcluster import Hooks
 from taskgraph.util import taskcluster as tc_util
 from taskgraph.util.taskcluster import (
@@ -16,6 +17,13 @@ from taskgraph.util.taskcluster import (
 logger = logging.getLogger(__name__)
 
 
+def get_index_url(index_path, multiple=False, block_proxy=True):
+    index_tmpl = liburls.api(
+        get_root_url(block_proxy=block_proxy), "index", "v1", "task{}/{}"
+    )
+    return index_tmpl.format("s" if multiple else "", index_path)
+
+
 def insert_index(index_path, task_id, data=None):
     # Find task expiry.
     expires = get_task_definition(task_id)["expires"]