tor-browser

commit 8e11aec37dcca61ac636cfaf49522474c4f906ae
parent d47cad1f76765c45cb8830509b0449fbe65e0aec
Author: Sandor Molnar <smolnar@mozilla.com>
Date:   Tue, 21 Oct 2025 22:00:58 +0300

Revert "Bug 1990567 - [ci] Stop post processing base_ref / base_rev parameters in decision task, r=taskgraph-reviewers,jcristau" for causing toolchain failures

This reverts commit 797144e673b1b39cf921d9421085f3824ca21c0f.

Revert "Bug 1990567 - Use deb12-toolchain-build image for linux python toolchains, r=firefox-build-system-reviewers,glandium"

This reverts commit 3c7154d8304d02b589d3cfaf67acbb769e11b798.

Diffstat:
M
taskcluster/gecko_taskgraph/decision.py
 | 
22
++++++++++++++++++++++
M
taskcluster/gecko_taskgraph/test/test_decision.py
 | 
6
++++--
M
taskcluster/kinds/docker-image/kind.yml
 | 
4
++++
M
taskcluster/kinds/toolchain/python.yml
 | 
4
++--

4 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/decision.py b/taskcluster/gecko_taskgraph/decision.py
@@ -13,6 +13,13 @@ 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
@@ -304,6 +311,21 @@ 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,8 +29,6 @@ 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",
@@ -76,6 +74,7 @@ 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",
@@ -133,6 +132,7 @@ 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,6 +149,8 @@ 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)
diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml
@@ -64,6 +64,10 @@ tasks:
     ubuntu1804-test:
         symbol: I(ub18-test)
         parent: ubuntu1804-test-base
+    ubuntu1804-build-python:
+        symbol: I(ub18-build-python)
+        parent: ubuntu1804-base
+        definition: build-python
     ubuntu2204-arm64-build-python:
         symbol: I(ub22-a64-build-python)
         parent: ubuntu2204-arm64-base
diff --git a/taskcluster/kinds/toolchain/python.yml b/taskcluster/kinds/toolchain/python.yml
@@ -25,7 +25,7 @@ linux64-python-3.9:
         fetch:
             - cpython-3.9.13
     worker:
-        docker-image: {in-tree: deb12-toolchain-build}
+        docker-image: {in-tree: ubuntu1804-build-python}
 
 linux64-aarch64-python-3.9:
     description: "cpython 3.9.13 AArch64/ARM64"
@@ -93,7 +93,7 @@ linux64-python-3.11:
         fetch:
             - cpython-3.11.7
     worker:
-        docker-image: {in-tree: deb12-toolchain-build}
+        docker-image: {in-tree: ubuntu1804-build-python}
 
 win64-python-3.11:
     description: "cpython 3.11.7"