Bug 1861439 - Add artifact build support to comm-release. r=firefox-b…

…uild-system-reviewers,nalexander Differential Revision: https://phabricator.services.mozilla.com/D191981
dothq · Oct 27, 2023 · 220fa92 · 220fa92
1 parent 0eefa79
commit 220fa92
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py
@@ -832,7 +832,9 @@ class ThunderbirdMixin(object):
     trust_domain = "comm"
     product = "thunderbird"
     try_tree = "try-comm-central"
-
+    default_candidate_trees = [
+        "releases/comm-release",
+    ]
     nightly_candidate_trees = [
         "comm-central",
     ]

diff --git a/python/mozbuild/mozbuild/test/test_artifacts.py b/python/mozbuild/mozbuild/test/test_artifacts.py
@@ -87,7 +87,7 @@ def test_candidate_trees_with_beta_version(self):
 
     def test_candidate_trees_with_esr_version(self):
         self._assert_candidate_trees(
-            version_display="91.3.0",
+            version_display="91.3.0esr",
             source_repo="https://hg.mozilla.org/releases/comm-esr91",
             expected_trees=ThunderbirdMixin.esr_candidate_trees,
         )
@@ -99,6 +99,13 @@ def test_candidate_trees_with_nightly_version(self):
             expected_trees=ThunderbirdMixin.nightly_candidate_trees,
         )
 
+    def test_candidate_trees_with_release_version(self):
+        self._assert_candidate_trees(
+            version_display="93.0.1",
+            source_repo="https://hg.mozilla.org/releases/comm-release",
+            expected_trees=ThunderbirdMixin.default_candidate_trees,
+        )
+
     def test_property_is_cached(self):
         job = FakeThunderbirdJob()
         expected_trees = ThunderbirdMixin.esr_candidate_trees