diff --git a/testing/mozharness/configs/single_locale/alder.py b/testing/mozharness/configs/single_locale/alder.py index 76a212b26370a..74ae068a4225c 100644 --- a/testing/mozharness/configs/single_locale/alder.py +++ b/testing/mozharness/configs/single_locale/alder.py @@ -23,7 +23,6 @@ "branch": "alder", "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/", "update_channel": "nightly", - "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/l10n-central", diff --git a/testing/mozharness/configs/single_locale/ash.py b/testing/mozharness/configs/single_locale/ash.py index 90736c8cebba0..7d11d9ec6707e 100644 --- a/testing/mozharness/configs/single_locale/ash.py +++ b/testing/mozharness/configs/single_locale/ash.py @@ -23,7 +23,6 @@ "branch": "ash", "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/", "update_channel": "nightly", - "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/l10n-central", diff --git a/testing/mozharness/configs/single_locale/date.py b/testing/mozharness/configs/single_locale/date.py index 5712cc7a5ec28..865ca374729be 100644 --- a/testing/mozharness/configs/single_locale/date.py +++ b/testing/mozharness/configs/single_locale/date.py @@ -5,7 +5,6 @@ "branch": "date", "en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central", "update_channel": "nightly-date", - "latest_mar_dir": '/pub/firefox/nightly/latest-date-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/l10n-central", diff --git a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py index e2dec2f6934b5..6f29aa2e5314e 100644 --- a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py +++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py @@ -6,9 +6,6 @@ # l10n "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta", - # mar - "latest_mar_dir": "fake_kill_me", - # repositories # staging beta dev releases use date repo for now "mozilla_dir": "date", diff --git a/testing/mozharness/configs/single_locale/dev-mozilla-release.py b/testing/mozharness/configs/single_locale/dev-mozilla-release.py index 370653df98f0a..1a1664ac0ceae 100644 --- a/testing/mozharness/configs/single_locale/dev-mozilla-release.py +++ b/testing/mozharness/configs/single_locale/dev-mozilla-release.py @@ -2,7 +2,6 @@ "branch": "jamun", "nightly_build": True, "update_channel": "release-dev", - "latest_mar_dir": 'fake_kill_me', # l10n "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release", diff --git a/testing/mozharness/configs/single_locale/mozilla-aurora.py b/testing/mozharness/configs/single_locale/mozilla-aurora.py index cdacc3ca802b4..be904450746b2 100644 --- a/testing/mozharness/configs/single_locale/mozilla-aurora.py +++ b/testing/mozharness/configs/single_locale/mozilla-aurora.py @@ -5,7 +5,6 @@ "branch": "mozilla-aurora", "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora/", "update_channel": "aurora", - "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora", diff --git a/testing/mozharness/configs/single_locale/mozilla-beta.py b/testing/mozharness/configs/single_locale/mozilla-beta.py index 4235946b6b14f..a2e40110d2447 100644 --- a/testing/mozharness/configs/single_locale/mozilla-beta.py +++ b/testing/mozharness/configs/single_locale/mozilla-beta.py @@ -3,7 +3,6 @@ "branch": "mozilla-beta", "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-beta/", "update_channel": "beta", - "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-beta-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta", diff --git a/testing/mozharness/configs/single_locale/mozilla-central.py b/testing/mozharness/configs/single_locale/mozilla-central.py index 59068eb590e01..f6d83fce1776a 100644 --- a/testing/mozharness/configs/single_locale/mozilla-central.py +++ b/testing/mozharness/configs/single_locale/mozilla-central.py @@ -5,7 +5,6 @@ "branch": "mozilla-central", "en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central", "update_channel": "nightly", - "latest_mar_dir": '/pub/firefox/nightly/latest-mozilla-central-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/l10n-central", diff --git a/testing/mozharness/configs/single_locale/mozilla-release.py b/testing/mozharness/configs/single_locale/mozilla-release.py index 515bded06235f..0677ec04b1792 100644 --- a/testing/mozharness/configs/single_locale/mozilla-release.py +++ b/testing/mozharness/configs/single_locale/mozilla-release.py @@ -3,7 +3,6 @@ "branch": "mozilla-release", "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-release/", "update_channel": "release", - "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-release-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release", diff --git a/testing/mozharness/configs/single_locale/try.py b/testing/mozharness/configs/single_locale/try.py index 5cef08e69f652..9fb7f833bd162 100644 --- a/testing/mozharness/configs/single_locale/try.py +++ b/testing/mozharness/configs/single_locale/try.py @@ -5,7 +5,6 @@ "branch": "try", "en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central", "update_channel": "nightly", - "latest_mar_dir": '/pub/firefox/nightly/latest-mozilla-central-l10n', "update_gecko_source_to_enUS": False, # l10n diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 7faf2117a96ed..817cb026ffb8d 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -935,11 +935,6 @@ def query_mach_build_env(self, multiLocale=None): 'stage_ssh_key': c['stage_ssh_key'] } - if self.query_is_nightly(): - mach_env['LATEST_MAR_DIR'] = c['latest_mar_dir'] % { - 'branch': self.branch - } - # this prevents taskcluster from overwriting the target files with # the multilocale files. Put everything from the en-US build in a # separate folder. diff --git a/testing/mozharness/scripts/desktop_l10n.py b/testing/mozharness/scripts/desktop_l10n.py index 57075572ed90a..36c0ce113ef54 100755 --- a/testing/mozharness/scripts/desktop_l10n.py +++ b/testing/mozharness/scripts/desktop_l10n.py @@ -416,7 +416,6 @@ def _query_upload_env(self): }) upload_env = self.query_env(partial_env=config.get("upload_env"), replace_dict=replace_dict) - upload_env['LATEST_MAR_DIR'] = config['latest_mar_dir'] # check if there are any extra option from the platform configuration # and append them to the env diff --git a/testing/mozharness/scripts/fx_desktop_build.py b/testing/mozharness/scripts/fx_desktop_build.py index 9c38c78c22346..e51b2f4010fe4 100755 --- a/testing/mozharness/scripts/fx_desktop_build.py +++ b/testing/mozharness/scripts/fx_desktop_build.py @@ -75,7 +75,6 @@ def __init__(self): ], 'stage_product': 'firefox', 'platform_supports_post_upload_to_latest': True, - 'latest_mar_dir': '/pub/mozilla.org/firefox/nightly/latest-%(branch)s', 'build_resources_path': '%(abs_src_dir)s/obj-firefox/.mozbuild/build_resources.json', 'nightly_promotion_branches': ['mozilla-central', 'mozilla-aurora'],