Bug 1839176 - Support esr115 (mozilla-releng#606)

jcristau · Jun 19, 2023 · 1c49bc8 · 1c49bc8
1 parent 5e5952e
commit 1c49bc8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/src/scriptworker/constants.py b/src/scriptworker/constants.py
@@ -430,13 +430,20 @@
                                 "/releases/mozilla-beta",
                                 "/releases/mozilla-release",
                                 "/releases/mozilla-esr102",
+                                "/releases/mozilla-esr115",
                                 "/projects/birch",
                             ),
                             # Limit things like pushapk to just these branches
                             "release": ("/releases/mozilla-release",),
                             "beta": ("/releases/mozilla-beta",),
-                            "beta-or-release": ("/releases/mozilla-beta", "/releases/mozilla-release"),
-                            "esr": ("/releases/mozilla-esr102",),
+                            "beta-or-release": (
+                                "/releases/mozilla-beta",
+                                "/releases/mozilla-release",
+                            ),
+                            "esr": (
+                                "/releases/mozilla-esr102",
+                                "/releases/mozilla-esr115",
+                            ),
                             "nightly": ("/mozilla-central",),
                             # Which repos can do nightly signing?
                             "all-nightly-branches": (
@@ -445,28 +452,43 @@
                                 "/releases/mozilla-beta",
                                 "/releases/mozilla-release",
                                 "/releases/mozilla-esr102",
+                                "/releases/mozilla-esr115",
                             ),
                             "all-production-branches": (
                                 "/mozilla-central",
                                 "/releases/mozilla-beta",
                                 "/releases/mozilla-release",
                                 "/releases/mozilla-esr102",
+                                "/releases/mozilla-esr115",
                             ),
                             "all-production-branches-and-autoland": (
                                 "/mozilla-central",
                                 "/releases/mozilla-beta",
                                 "/releases/mozilla-release",
                                 "/releases/mozilla-esr102",
+                                "/releases/mozilla-esr115",
                                 "/integration/autoland",
                             ),
                         }
                     ),
                     "thunderbird": immutabledict(
                         {
-                            "all-release-branches": ("/releases/comm-beta", "/releases/comm-esr102"),
+                            "all-release-branches": (
+                                "/releases/comm-beta",
+                                "/releases/comm-esr102",
+                                "/releases/comm-esr115",
+                            ),
                             "beta": ("/releases/comm-beta",),
-                            "esr": ("/releases/comm-esr102",),
-                            "all-nightly-branches": ("/comm-central", "/releases/comm-beta", "/releases/comm-esr102"),
+                            "esr": (
+                                "/releases/comm-esr102",
+                                "/releases/comm-esr115",
+                            ),
+                            "all-nightly-branches": (
+                                "/comm-central",
+                                "/releases/comm-beta",
+                                "/releases/comm-esr102",
+                                "/releases/comm-esr102",
+                            ),
                             "nightly": ("/comm-central",),
                         }
                     ),

diff --git a/tests/test_task.py b/tests/test_task.py
@@ -198,6 +198,7 @@ def test_get_worker_type(task, result):
         ("https://hg.mozilla.org/mozilla-central", "mozilla-central", False, "firefox"),
         ("https://hg.mozilla.org/projects/foo", "foo", True, "firefox"),
         ("https://hg.mozilla.org/releases/mozilla-esr102", "mozilla-esr102", False, "firefox"),
+        ("https://hg.mozilla.org/releases/mozilla-esr115", "mozilla-esr115", False, "firefox"),
         ("https://hg.mozilla.org/try", "try", False, "firefox"),
         ("https://hg.mozilla.org/releases/unknown", "unknown", True, "firefox"),
         ("https://hg.mozilla.org/users/mozilla_hocat.ca/esr60-stage/", "", True, "firefox"),