Skip to content

Commit

Permalink
Bug 1337366 - Remove reference to unused latest_mar_dir r=jlund
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: Ba8rzGPJnGt

--HG--
extra : rebase_source : 2559d3448917537c578ce3292d5977d9d8b483c9
  • Loading branch information
Rail Aliiev committed Feb 7, 2017
1 parent 2041d5b commit 357214a
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 19 deletions.
1 change: 0 additions & 1 deletion testing/mozharness/configs/single_locale/alder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion testing/mozharness/configs/single_locale/ash.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion testing/mozharness/configs/single_locale/date.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions testing/mozharness/configs/single_locale/dev-mozilla-beta.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion testing/mozharness/configs/single_locale/mozilla-aurora.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion testing/mozharness/configs/single_locale/mozilla-beta.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion testing/mozharness/configs/single_locale/try.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions testing/mozharness/mozharness/mozilla/building/buildbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion testing/mozharness/scripts/desktop_l10n.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion testing/mozharness/scripts/fx_desktop_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],

Expand Down

0 comments on commit 357214a

Please sign in to comment.