--- a/testing/mozharness/configs/multi_locale/ash_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/ash_android-x86.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
--- a/testing/mozharness/configs/multi_locale/ash_android.json
+++ b/testing/mozharness/configs/multi_locale/ash_android.json
@@ -18,11 +18,10 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/date_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/date_android-armv6.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
--- a/testing/mozharness/configs/multi_locale/date_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/date_android-x86.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
--- a/testing/mozharness/configs/multi_locale/date_android.json
+++ b/testing/mozharness/configs/multi_locale/date_android.json
@@ -18,11 +18,10 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
@@ -17,12 +17,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
--- a/testing/mozharness/configs/multi_locale/jamun_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
@@ -17,12 +17,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
--- a/testing/mozharness/configs/multi_locale/jamun_android.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android.json
@@ -17,11 +17,10 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-aurora",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-aurora",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
@@ -18,11 +18,10 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-aurora",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
@@ -18,11 +18,10 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
@@ -18,11 +18,10 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
@@ -18,12 +18,11 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
}
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
@@ -18,11 +18,10 @@
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
@@ -23,11 +23,10 @@
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
@@ -23,11 +23,10 @@
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
@@ -23,11 +23,10 @@
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-beta",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
@@ -23,12 +23,11 @@
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
- "merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
}
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
@@ -23,11 +23,10 @@
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-release",
- "merge_locales": true,
"mozilla_dir": "build"
}
--- a/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
+++ b/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
@@ -29,17 +29,16 @@ config = {
"branch": "default",
"dest": BUILD_DIR,
}],
"vcs_share_base": "/builds/hg-shared",
"l10n_repos": [],
"hg_l10n_base": "https://hg.mozilla.org/%s" % L10N_REPO_PATH,
"hg_l10n_tag": "default",
"l10n_dir": "l10n",
- "merge_locales": True,
"mozilla_dir": BUILD_DIR,
"mozconfig": MOZCONFIG,
"default_actions": [
"pull-locale-source",
"build",
"package-en-US",
"backup-objdir",
"restore-objdir",
--- a/testing/mozharness/configs/single_locale/ash_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-16.py
@@ -44,22 +44,20 @@ config = {
'vcs_share_base': HG_SHARE_BASE_DIR,
"l10n_dir": "l10n-central",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": EN_US_BINARY_URL,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"stage_product": "mobile",
"platform": "android",
"build_type": "api-16-opt",
# Balrog
--- a/testing/mozharness/configs/single_locale/date_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/date_android-api-16.py
@@ -42,22 +42,20 @@ config = {
'vcs_share_base': "/builds/hg-shared",
"l10n_dir": "l10n-central",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "nightly-date",
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"stage_product": "mobile",
"platform": "android",
"build_type": "api-16-opt",
# Balrog
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
@@ -41,22 +41,20 @@ config = {
'vcs_share_base': "/builds/hg-shared",
"l10n_dir": "mozilla-beta",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "nightly-jamun",
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"stage_product": "mobile",
"platform": "android",
"build_type": "api-16-opt",
# Balrog
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -3,20 +3,18 @@ import os
config = {
"platform": "linux",
"stage_product": "firefox",
"update_platform": "Linux_x86-gcc3",
"mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
"js_src_dir": "js/src",
@@ -26,17 +24,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
"current_mar_dir": "dist/current",
"update_mar_dir": "dist/update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist/l10n-stage",
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -3,20 +3,18 @@ import os
config = {
"platform": "linux64",
"stage_product": "firefox",
"update_platform": "Linux_x86_64-gcc3",
"mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
"js_src_dir": "js/src",
@@ -26,17 +24,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
"current_mar_dir": "dist/current",
"update_mar_dir": "dist/update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist/l10n-stage",
--- a/testing/mozharness/configs/single_locale/linux64_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@@ -3,20 +3,18 @@ import os
config = {
"platform": "linux64",
"stage_product": "firefox",
"update_platform": "Linux_x86_64-gcc3",
"mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
"js_src_dir": "js/src",
@@ -26,17 +24,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
"current_mar_dir": "dist/current",
"update_mar_dir": "dist/update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist/l10n-stage",
--- a/testing/mozharness/configs/single_locale/linux_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@@ -3,20 +3,18 @@ import os
config = {
"platform": "linux",
"stage_product": "firefox",
"update_platform": "Linux_x86-gcc3",
"mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
"js_src_dir": "js/src",
@@ -26,17 +24,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
"current_mar_dir": "dist/current",
"update_mar_dir": "dist/update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist/l10n-stage",
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -9,20 +9,18 @@ config = {
"bootstrap_env": {
"SHELL": '/bin/bash',
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"MOZ_PKG_PLATFORM": "mac",
# "IS_NIGHTLY": "yes",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
'EN_US_PACKAGE_NAME': 'target.dmg',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
"js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
@@ -34,17 +32,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
"current_mar_dir": "dist/current",
"update_mar_dir": "dist/update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist/l10n-stage",
--- a/testing/mozharness/configs/single_locale/macosx64_devedition.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@@ -9,20 +9,18 @@ config = {
"bootstrap_env": {
"SHELL": '/bin/bash',
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"MOZ_PKG_PLATFORM": "mac",
# "IS_NIGHTLY": "yes",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
'EN_US_PACKAGE_NAME': 'target.dmg',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
"js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
@@ -34,17 +32,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist/previous",
"current_mar_dir": "dist/current",
"update_mar_dir": "dist/update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist/l10n-stage",
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
@@ -48,22 +48,20 @@ config = {
'vcs_share_base': HG_SHARE_BASE_DIR,
"l10n_dir": MOZILLA_DIR,
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"stage_product": "mobile",
"platform": "android",
"build_type": "api-16-opt",
# Balrog
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
@@ -46,22 +46,20 @@ config = {
'vcs_share_base': HG_SHARE_BASE_DIR,
"l10n_dir": "l10n-central",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"key_alias": "release",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
@@ -48,22 +48,20 @@ config = {
'vcs_share_base': HG_SHARE_BASE_DIR,
"l10n_dir": "l10n-central",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": OBJDIR,
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"stage_product": "mobile",
"platform": "android",
"build_type": "api-16-opt",
# Balrog
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
@@ -46,22 +46,20 @@ config = {
'vcs_share_base': HG_SHARE_BASE_DIR,
"l10n_dir": "l10n-central",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"key_alias": "release",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_16.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_16.py
@@ -46,24 +46,22 @@ config = {
"l10n_dir": MOZILLA_DIR,
"release_config_file": "buildbot-configs/mozilla/staging_release-fennec-mozilla-beta.py",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_PKG_VERSION": "%(version)s",
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"base_en_us_binary_url": EN_US_BINARY_URL,
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-16/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_16.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_16.py
@@ -46,24 +46,22 @@ config = {
"l10n_dir": MOZILLA_DIR,
"release_config_file": "buildbot-configs/mozilla/staging_release-fennec-mozilla-release.py",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_PKG_VERSION": "%(version)s",
"MOZ_OBJDIR": OBJDIR,
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
},
"base_en_us_binary_url": EN_US_BINARY_URL,
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
"base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android-api-16/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates %(post_upload_extra)s",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
# Mock
"mock_target": "mozilla-centos6-x86_64-android",
"mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
'gtk2-devel', 'libnotify-devel', 'yasm',
--- a/testing/mozharness/configs/single_locale/tc_linux32.py
+++ b/testing/mozharness/configs/single_locale/tc_linux32.py
@@ -5,20 +5,18 @@ EN_US_BINARY_URL = "%(en_us_binary_url)s
config = {
"locales_file": "src/browser/locales/all-locales",
"tools_repo": "https://hg.mozilla.org/build/tools",
"mozconfig": "src/browser/config/mozconfigs/linux32/l10n-mozconfig",
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/builds/worker/artifacts/',
},
--- a/testing/mozharness/configs/single_locale/tc_linux64.py
+++ b/testing/mozharness/configs/single_locale/tc_linux64.py
@@ -5,20 +5,18 @@ EN_US_BINARY_URL = "%(en_us_binary_url)s
config = {
"locales_file": "src/browser/locales/all-locales",
"tools_repo": "https://hg.mozilla.org/build/tools",
"mozconfig": "src/browser/config/mozconfigs/linux64/l10n-mozconfig",
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/builds/worker/artifacts/',
},
--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -5,20 +5,18 @@ EN_US_BINARY_URL = "%(en_us_binary_url)s
config = {
"locales_file": "src/browser/locales/all-locales",
"tools_repo": "https://hg.mozilla.org/build/tools",
"mozconfig": "src/browser/config/mozconfigs/macosx64/l10n-mozconfig",
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/builds/worker/artifacts/',
},
--- a/testing/mozharness/configs/single_locale/tc_win32.py
+++ b/testing/mozharness/configs/single_locale/tc_win32.py
@@ -10,20 +10,18 @@ config = {
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
# EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
'EN_US_PACKAGE_NAME': 'target.zip',
'EN_US_PKG_INST_BASENAME': 'target.installer',
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
--- a/testing/mozharness/configs/single_locale/tc_win64.py
+++ b/testing/mozharness/configs/single_locale/tc_win64.py
@@ -10,20 +10,18 @@ config = {
"bootstrap_env": {
"NO_MERCURIAL_SETUP_CHECK": "1",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
# EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
'EN_US_PACKAGE_NAME': 'target.zip',
'EN_US_PKG_INST_BASENAME': 'target.installer',
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
--- a/testing/mozharness/configs/single_locale/try_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-16.py
@@ -47,22 +47,20 @@ config = {
'vcs_share_base': "/builds/hg-shared",
"l10n_dir": "l10n-central",
"repack_env": {
# so ugly, bug 951238
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "try", # XXX Invalid
},
"upload_branch": "%s-android-api-16" % BRANCH,
"ssh_key_dir": "~/.ssh",
- "merge_locales": True,
"mozilla_dir": MOZILLA_DIR,
"mozconfig": "%s/mobile/android/config/mozconfigs/android-api-16/l10n-nightly" % MOZILLA_DIR,
"signature_verification_script": "tools/release/signing/verify-android-signature.sh",
"stage_product": "mobile",
"platform": "android", # XXX Validate
"build_type": "api-16-opt", # XXX Validate
# Balrog
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -4,17 +4,16 @@ import sys
config = {
"platform": "win32",
"stage_product": "firefox",
"update_platform": "WINNT_x86-msvc",
"mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
"PATH": '%(abs_objdir)s\\..\\xz-5.2.3\\bin_x86-64;'
'C:\\mozilla-build\\nsis-3.01;'
+ '%s' % (os.environ.get('path')),
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
@@ -37,17 +36,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",
"current_mar_dir": "dist\\current",
"update_mar_dir": "dist\\update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist\\l10n-stage",
--- a/testing/mozharness/configs/single_locale/win32_devedition.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@@ -4,17 +4,16 @@ import sys
config = {
"platform": "win32",
"stage_product": "firefox",
"update_platform": "WINNT_x86-msvc",
"mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig-devedition",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
"PATH": '%(abs_objdir)s\\..\\xz-5.2.3\\bin_x86-64;'
'C:\\mozilla-build\\nsis-3.01;'
+ '%s' % (os.environ.get('path')),
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
@@ -37,17 +36,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",
"current_mar_dir": "dist\\current",
"update_mar_dir": "dist\\update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist\\l10n-stage",
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -6,17 +6,16 @@ config = {
"stage_product": "firefox",
"update_platform": "WINNT_x86_64-msvc",
"mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
"PATH": '%(abs_objdir)s\\..\\xz-5.2.3\\bin_x86-64;'
'C:\\mozilla-build\\nsis-3.01;'
+ '%s' % (os.environ.get('path')),
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
'EN_US_PACKAGE_NAME': 'target.zip',
@@ -37,17 +36,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",
"current_mar_dir": "dist\\current",
"update_mar_dir": "dist\\update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist\\l10n-stage",
--- a/testing/mozharness/configs/single_locale/win64_devedition.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@@ -6,17 +6,16 @@ config = {
"stage_product": "firefox",
"update_platform": "WINNT_x86_64-msvc",
"mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig-devedition",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
- "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
"PATH": '%(abs_objdir)s\\..\\xz-5.2.3\\bin_x86-64;'
'C:\\mozilla-build\\nsis-3.01;'
+ '%s' % (os.environ.get('path')),
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
'EN_US_PACKAGE_NAME': 'target.zip',
@@ -37,17 +36,16 @@ config = {
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US", "ja-JP-mac"],
"l10n_dir": "l10n",
"locales_file": "%(branch)s/browser/locales/all-locales",
"locales_dir": "browser/locales",
"hg_l10n_tag": "default",
- "merge_locales": True,
# MAR
"previous_mar_dir": "dist\\previous",
"current_mar_dir": "dist\\current",
"update_mar_dir": "dist\\update", # sure?
"previous_mar_filename": "previous.mar",
"current_work_mar_dir": "current.work",
"package_base_dir": "dist\\l10n-stage",