Bug 1881272: remove support for unused 'l10n_repos', 'tag_override', …

…and 'gecko_locale_revisions' in mozharness r=releng-reviewers,ahal,jcristau I didn't do archaeology on these, but I checked the current tree for usages of the underscored and hyphenated versions of these. There are a handful of places where they get passed around, but I was unable to find anywhere that actually _sets_ them. Differential Revision: https://phabricator.services.mozilla.com/D211983
Brli · May 31, 2024 · a05bec7 · a05bec7
1 parent be7d06b
commit a05bec7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 36 deletions.
diff --git a/testing/mozharness/mozharness/base/vcs/vcsbase.py b/testing/mozharness/mozharness/base/vcs/vcsbase.py
@@ -83,9 +83,7 @@ def vcs_checkout(self, vcs=None, error_level=FATAL, **kwargs):
             args=(vcs_obj, kwargs["dest"]),
         )
 
-    def vcs_checkout_repos(
-        self, repo_list, parent_dir=None, tag_override=None, **kwargs
-    ):
+    def vcs_checkout_repos(self, repo_list, parent_dir=None, **kwargs):
         """Check out a list of repos."""
         orig_dir = os.getcwd()
         c = self.config
@@ -98,8 +96,6 @@ def vcs_checkout_repos(
         for repo_dict in repo_list:
             kwargs = deepcopy(kwargs_orig)
             kwargs.update(repo_dict)
-            if tag_override:
-                kwargs["branch"] = tag_override
             dest = self.query_dest(kwargs)
             revision_dict[dest] = {"repo": kwargs["repo"]}
             revision_dict[dest]["revision"] = self.vcs_checkout(**kwargs)

diff --git a/testing/mozharness/mozharness/mozilla/l10n/locales.py b/testing/mozharness/mozharness/mozilla/l10n/locales.py
@@ -4,8 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 # ***** END LICENSE BLOCK *****
-"""Localization.
-"""
+"""Localization."""
 
 import os
 import pprint
@@ -22,7 +21,6 @@ def __init__(self, **kwargs):
         """
         self.abs_dirs = None
         self.locales = None
-        self.gecko_locale_revisions = None
         self.l10n_revisions = {}
 
     def query_locales(self):
@@ -145,11 +143,6 @@ def pull_locale_source(self, hg_l10n_base=None, parent_dir=None, vcs="hg"):
         if parent_dir is None:
             parent_dir = self.query_abs_dirs()["abs_l10n_dir"]
         self.mkdir_p(parent_dir)
-        # This block is to allow for pulling buildbot-configs in Fennec
-        # release builds, since we don't pull it in MBF anymore.
-        if c.get("l10n_repos"):
-            repos = c.get("l10n_repos")
-            self.vcs_checkout_repos(repos, tag_override=c.get("tag_override"))
         # Pull locales
         locales = self.query_locales()
         locale_repos = []
@@ -160,12 +153,10 @@ def pull_locale_source(self, hg_l10n_base=None, parent_dir=None, vcs="hg"):
             locale_repos.append(
                 {"repo": "%s/%s" % (hg_l10n_base, locale), "branch": tag, "vcs": vcs}
             )
-        revs = self.vcs_checkout_repos(
+        self.vcs_checkout_repos(
             repo_list=locale_repos,
             parent_dir=parent_dir,
-            tag_override=c.get("tag_override"),
         )
-        self.gecko_locale_revisions = revs
 
 
 # __main__ {{{1

diff --git a/testing/mozharness/mozharness/mozilla/l10n/multi_locale_build.py b/testing/mozharness/mozharness/mozilla/l10n/multi_locale_build.py
@@ -64,15 +64,6 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
                 "help": "Specify the L10n tag",
             },
         ],
-        [
-            ["--tag-override"],
-            {
-                "action": "store",
-                "dest": "tag_override",
-                "type": "string",
-                "help": "Override the tags set for all repos",
-            },
-        ],
     ]
 
     def __init__(self, require_config_file=True):

diff --git a/testing/mozharness/scripts/desktop_l10n.py b/testing/mozharness/scripts/desktop_l10n.py
@@ -59,17 +59,6 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript):
                 " revision separated by colon, en-GB:default.",
             },
         ],
-        [
-            [
-                "--tag-override",
-            ],
-            {
-                "action": "store",
-                "dest": "tag_override",
-                "type": "string",
-                "help": "Override the tags set for all repos",
-            },
-        ],
         [
             [
                 "--en-us-installer-url",