tor-browser

commit 55086d47ce4078aa4b2559df827835a72f48dc72
parent a4c4ec5b39cf29292a49e2f36b868963a7b4dec9
Author: Andrew Halberstadt <ahal@mozilla.com>
Date:   Wed, 22 Oct 2025 18:22:22 +0000

Bug 1990567 - [ci] Stop post processing base_ref / base_rev parameters in decision task, r=taskgraph-reviewers,jcristau

These internal functions have been removed from Taskgraph v17

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

Diffstat:
M
taskcluster/gecko_taskgraph/decision.py
 | 
22
----------------------
M
taskcluster/gecko_taskgraph/test/test_decision.py
 | 
6
++----

2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/decision.py b/taskcluster/gecko_taskgraph/decision.py
@@ -13,13 +13,6 @@ import yaml
 from redo import retry
 from taskgraph import create
 from taskgraph.create import create_tasks
-
-# TODO: Let standalone taskgraph generate parameters instead of calling internals
-from taskgraph.decision import (
-    _determine_more_accurate_base_ref,
-    _determine_more_accurate_base_rev,
-    _get_env_prefix,
-)
 from taskgraph.generator import TaskGraphGenerator
 from taskgraph.parameters import Parameters
 from taskgraph.taskgraph import TaskGraph
@@ -311,21 +304,6 @@ def get_decision_parameters(graph_config, options):
     except UnicodeDecodeError:
         commit_message = ""
 
-    parameters["base_ref"] = _determine_more_accurate_base_ref(
-        repo,
-        candidate_base_ref=options.get("base_ref"),
-        head_ref=options.get("head_ref"),
-        base_rev=options.get("base_rev"),
-    )
-
-    parameters["base_rev"] = _determine_more_accurate_base_rev(
-        repo,
-        base_ref=parameters["base_ref"],
-        candidate_base_rev=options.get("base_rev"),
-        head_rev=options.get("head_rev"),
-        env_prefix=_get_env_prefix(graph_config),
-    )
-
     # Set some vcs specific parameters
     if parameters["repository_type"] == "hg":
         if head_git_rev := get_hg_revision_info(
diff --git a/taskcluster/gecko_taskgraph/test/test_decision.py b/taskcluster/gecko_taskgraph/test/test_decision.py
@@ -29,6 +29,8 @@ def register():
 def options():
     return {
         "base_repository": "https://hg.mozilla.org/mozilla-unified",
+        "base_ref": "mybranch",
+        "base_rev": "1234",
         "head_repository": "https://hg.mozilla.org/mozilla-central",
         "head_rev": "abcd",
         "head_ref": "ef01",
@@ -74,7 +76,6 @@ def test_write_artifact_yml():
 @patch("gecko_taskgraph.decision.get_hg_revision_info")
 @patch("gecko_taskgraph.decision.get_hg_revision_branch")
 @patch("gecko_taskgraph.decision.get_repository")
-@patch("gecko_taskgraph.decision._determine_more_accurate_base_rev")
 @patch("gecko_taskgraph.decision.get_changed_files")
 @pytest.mark.parametrize(
     "extra_options,commit_msg,ttc,expected",
@@ -132,7 +133,6 @@ def test_write_artifact_yml():
 )
 def test_get_decision_parameters(
     mock_get_changed_files,
-    mock_determine_more_accurate_base_rev,
     mock_get_repository,
     mock_get_hg_revision_branch,
     mock_get_hg_revision_info,
@@ -149,8 +149,6 @@ def test_get_decision_parameters(
     mock_repo.default_branch = "baseref"
     mock_repo.get_commit_message.return_value = commit_msg or "commit message"
     mock_get_repository.return_value = mock_repo
-
-    mock_determine_more_accurate_base_rev.return_value = "baserev"
     mock_get_changed_files.return_value = ["foo.txt", "bar/baz.md"]
 
     options.update(extra_options)