Bug 1333769 - Pass a MAR url to l10n tasks in taskcluster. r=jlund
(for "Nightly l10n repacks generate wrong complete MARs")
MozReview-Commit-ID: Brewog21QZp
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -66,20 +66,24 @@ job-template:
macosx64-nightly: macosx64/opt
android-api-15-nightly: android-4-0-armv7-api15/opt
env:
by-build-platform:
linux.*: # linux64 and 32 get same treatment here
EN_US_PACKAGE_NAME: target.tar.bz2
EN_US_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build
+ MAR_TOOLS_URL:
+ task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/host/bin
macosx64-nightly:
EN_US_PACKAGE_NAME: target.dmg
EN_US_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build
+ MAR_TOOLS_URL:
+ task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/host/bin
android-api-15-nightly:
EN_US_PACKAGE_NAME: target.apk
EN_US_BINARY_URL:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/en-US
mozharness:
config:
by-build-platform:
linux-nightly:
--- a/testing/mozharness/configs/single_locale/alder.py
+++ b/testing/mozharness/configs/single_locale/alder.py
@@ -11,28 +11,34 @@
#
# If you really want to have localized alder builds, use the use the following
# values:
# * "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/alder-%(platform)s/latest/",
# * "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/alder-%(platform)s/latest/",
# * "repo": "https://hg.mozilla.org/projects/alder",
#
+import os
+
config = {
"nightly_build": True,
"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",
# mar
- "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
+ "mar_tools_url": os.environ.get(
+ "MAR_TOOLS_URL",
+ # Buildbot l10n fetches from ftp rather than setting an environ var
+ "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s"
+ ),
# repositories
"mozilla_dir": "alder",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
--- a/testing/mozharness/configs/single_locale/ash.py
+++ b/testing/mozharness/configs/single_locale/ash.py
@@ -11,28 +11,34 @@
#
# If you really want to have localized ash builds, use the use the following
# values:
# * "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/ash-%(platform)s/latest/",
# * "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/ash-%(platform)s/latest/",
# * "repo": "https://hg.mozilla.org/projects/ash",
#
+import os
+
config = {
"nightly_build": True,
"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",
# mar
- "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
+ "mar_tools_url": os.environ.get(
+ "MAR_TOOLS_URL",
+ # Buildbot l10n fetches from ftp rather than setting an environ var
+ "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s"
+ ),
# repositories
"mozilla_dir": "ash",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
--- a/testing/mozharness/configs/single_locale/date.py
+++ b/testing/mozharness/configs/single_locale/date.py
@@ -1,20 +1,26 @@
+import os
+
config = {
"nightly_build": True,
"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",
# mar
- "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
+ "mar_tools_url": os.environ.get(
+ "MAR_TOOLS_URL",
+ # Buildbot l10n fetches from ftp rather than setting an environ var
+ "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s"
+ ),
# repositories
"mozilla_dir": "date",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
--- a/testing/mozharness/configs/single_locale/mozilla-aurora.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora.py
@@ -1,20 +1,26 @@
+import os
+
config = {
"nightly_build": True,
"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",
# mar
- "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora/mar-tools/%(platform)s",
+ "mar_tools_url": os.environ.get(
+ "MAR_TOOLS_URL",
+ # Buildbot l10n fetches from ftp rather than setting an environ var
+ "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora/mar-tools/%(platform)s"
+ ),
# repositories
"mozilla_dir": "mozilla-aurora",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
--- a/testing/mozharness/configs/single_locale/mozilla-central.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central.py
@@ -1,20 +1,26 @@
+import os
+
config = {
"nightly_build": True,
"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",
# mar
- "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
+ "mar_tools_url": os.environ.get(
+ "MAR_TOOLS_URL",
+ # Buildbot l10n fetches from ftp rather than setting an environ var
+ "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s"
+ ),
# repositories
"mozilla_dir": "mozilla-central",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
--- a/testing/mozharness/configs/single_locale/try.py
+++ b/testing/mozharness/configs/single_locale/try.py
@@ -1,21 +1,27 @@
+import os
+
config = {
"nightly_build": False,
"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
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
# mar
- "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
+ "mar_tools_url": os.environ.get(
+ "MAR_TOOLS_URL",
+ # Buildbot l10n fetches from ftp rather than setting an environ var
+ "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s"
+ ),
# repositories
"mozilla_dir": "try",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",