From f824feb1a9a1365b73acea9c936b6fe024514763 Mon Sep 17 00:00:00 2001
From: Axel Hecht <axel@pike.org>
Date: Mon, 18 Sep 2017 15:00:37 +0200
Subject: [PATCH] bug 1399523, adjust configs to not merge l10n in mozharness,
r=Callek
MozReview-Commit-ID: 5SmOCzTZiqz
--HG--
extra : rebase_source : 3f75fe0d8efc1fd7f4d671128790e2d0a0d43d57
---
testing/mozharness/configs/multi_locale/ash_android-x86.json | 1 -
testing/mozharness/configs/multi_locale/ash_android.json | 1 -
.../mozharness/configs/multi_locale/date_android-armv6.json | 1 -
testing/mozharness/configs/multi_locale/date_android-x86.json | 1 -
testing/mozharness/configs/multi_locale/date_android.json | 1 -
.../mozharness/configs/multi_locale/jamun_android-armv6.json | 1 -
testing/mozharness/configs/multi_locale/jamun_android-x86.json | 1 -
testing/mozharness/configs/multi_locale/jamun_android.json | 1 -
.../configs/multi_locale/mozilla-aurora_android-armv6.json | 1 -
.../configs/multi_locale/mozilla-aurora_android-x86.json | 1 -
.../configs/multi_locale/mozilla-aurora_android.json | 1 -
.../configs/multi_locale/mozilla-beta_android-armv6.json | 1 -
.../configs/multi_locale/mozilla-beta_android-x86.json | 1 -
.../mozharness/configs/multi_locale/mozilla-beta_android.json | 1 -
.../configs/multi_locale/mozilla-central_android-armv6.json | 1 -
.../configs/multi_locale/mozilla-central_android-x86.json | 1 -
.../configs/multi_locale/mozilla-central_android.json | 1 -
.../configs/multi_locale/mozilla-release_android-armv6.json | 1 -
.../configs/multi_locale/mozilla-release_android-x86.json | 1 -
.../configs/multi_locale/mozilla-release_android.json | 1 -
.../multi_locale/release_mozilla-beta_android-armv6.json | 1 -
.../configs/multi_locale/release_mozilla-beta_android-x86.json | 1 -
.../configs/multi_locale/release_mozilla-beta_android.json | 1 -
.../multi_locale/release_mozilla-release_android-armv6.json | 1 -
.../multi_locale/release_mozilla-release_android-x86.json | 1 -
.../configs/multi_locale/release_mozilla-release_android.json | 1 -
.../staging_release_mozilla-beta_android-armv6.json | 1 -
.../multi_locale/staging_release_mozilla-beta_android-x86.json | 1 -
.../multi_locale/staging_release_mozilla-beta_android.json | 1 -
.../staging_release_mozilla-release_android-armv6.json | 1 -
.../staging_release_mozilla-release_android-x86.json | 1 -
.../multi_locale/staging_release_mozilla-release_android.json | 1 -
.../configs/multi_locale/standalone_mozilla-central.py | 1 -
testing/mozharness/configs/single_locale/ash_android-api-16.py | 2 --
.../mozharness/configs/single_locale/date_android-api-16.py | 2 --
.../mozharness/configs/single_locale/jamun_android-api-16.py | 2 --
testing/mozharness/configs/single_locale/linux.py | 3 ---
testing/mozharness/configs/single_locale/linux64.py | 3 ---
testing/mozharness/configs/single_locale/linux64_devedition.py | 3 ---
testing/mozharness/configs/single_locale/linux_devedition.py | 3 ---
testing/mozharness/configs/single_locale/macosx64.py | 3 ---
.../mozharness/configs/single_locale/macosx64_devedition.py | 3 ---
.../configs/single_locale/mozilla-aurora_android-api-16.py | 2 --
.../configs/single_locale/mozilla-beta_android-api-16.py | 2 --
.../configs/single_locale/mozilla-central_android-api-16.py | 2 --
.../configs/single_locale/mozilla-release_android-api-16.py | 2 --
.../staging_release_mozilla-beta_android_api_16.py | 2 --
.../staging_release_mozilla-release_android_api_16.py | 2 --
testing/mozharness/configs/single_locale/tc_linux32.py | 2 --
testing/mozharness/configs/single_locale/tc_linux64.py | 2 --
testing/mozharness/configs/single_locale/tc_macosx64.py | 2 --
testing/mozharness/configs/single_locale/tc_win32.py | 2 --
testing/mozharness/configs/single_locale/tc_win64.py | 2 --
testing/mozharness/configs/single_locale/try_android-api-16.py | 2 --
testing/mozharness/configs/single_locale/win32.py | 2 --
testing/mozharness/configs/single_locale/win32_devedition.py | 2 --
testing/mozharness/configs/single_locale/win64.py | 2 --
testing/mozharness/configs/single_locale/win64_devedition.py | 2 --
58 files changed, 89 deletions(-)
diff --git a/testing/mozharness/configs/multi_locale/ash_android-x86.json b/testing/mozharness/configs/multi_locale/ash_android-x86.json
index 6fe6c442b2482..6d20c0a5bd6b1 100644
--- a/testing/mozharness/configs/multi_locale/ash_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/ash_android-x86.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/ash_android.json b/testing/mozharness/configs/multi_locale/ash_android.json
index 991ecc00185af..e22d9ecb4f665 100644
--- a/testing/mozharness/configs/multi_locale/ash_android.json
+++ b/testing/mozharness/configs/multi_locale/ash_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/date_android-armv6.json b/testing/mozharness/configs/multi_locale/date_android-armv6.json
index d6ea042897745..1a0bf0eabdeea 100644
--- a/testing/mozharness/configs/multi_locale/date_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/date_android-armv6.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/date_android-x86.json b/testing/mozharness/configs/multi_locale/date_android-x86.json
index 692433b980aab..0443e1e02d852 100644
--- a/testing/mozharness/configs/multi_locale/date_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/date_android-x86.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/date_android.json b/testing/mozharness/configs/multi_locale/date_android.json
index 75a166e425da5..d70afb9f52e89 100644
--- a/testing/mozharness/configs/multi_locale/date_android.json
+++ b/testing/mozharness/configs/multi_locale/date_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
index e36fc43b0bb1e..28dd8c9d7b6f0 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
@@ -22,7 +22,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/jamun_android-x86.json b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
index f31539f3fa7a4..17a3b7441df24 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
@@ -22,7 +22,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/jamun_android.json b/testing/mozharness/configs/multi_locale/jamun_android.json
index 0a92bb8140a7e..39cdefe3d5b8d 100644
--- a/testing/mozharness/configs/multi_locale/jamun_android.json
+++ b/testing/mozharness/configs/multi_locale/jamun_android.json
@@ -22,6 +22,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
index 122b9255a8c0f..415daabee6f84 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
index bbd0cc4cbe738..32939397b7c99 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
index aa44ba7ce4d36..71a60975d4524 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
@@ -23,6 +23,5 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
index 242324c94f95b..7c49db92be565 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
index 67dddd4901b8e..795663ff38dbd 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
index d07b02c618556..78e342f4c08a3 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
index 98c9f36ff0abf..ff244a43a94a0 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
index 468a7e0cfe5cf..8de4f34a5468a 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-central_android.json b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
index a99c46bc2fef0..101ad669c298e 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json b/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
index dbf07ad5bf481..f2d7cafe91fca 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
index 7014735f9ca41..1c9e5f7b80559 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
@@ -23,7 +23,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/mozilla-release_android.json b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
index fbacb99f9a988..8c8f9c7db8437 100644
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
@@ -23,6 +23,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"hg_l10n_tag": "default",
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
index 9784e61b61ab4..d498873434e08 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
@@ -28,7 +28,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
index a684b395b27fc..725b79531baa0 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
@@ -28,7 +28,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
index 6fc4c1b29b7b0..bdebacbf3d4a6 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
@@ -28,6 +28,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
index 125d3d8b0d8b1..75f8085d39bab 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
@@ -28,7 +28,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
index a5428e4b2d9c8..596fc0173f5de 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
@@ -28,7 +28,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json b/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
index 8b6351aeb5120..7f9ac962940f2 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
@@ -28,6 +28,5 @@
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
"required_config_vars": ["tag_override"],
"l10n_dir": "l10n-central",
- "merge_locales": true,
"mozilla_dir": "build"
}
diff --git 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
index 032e04ff79604..42e4b168a8b87 100644
--- 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
@@ -28,7 +28,6 @@
"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"
}
diff --git 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
index a055b0ab993d3..fd1f969ec82b0 100644
--- 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
@@ -28,7 +28,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
index 1447ffd91881f..4cdfa83d2a9f7 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
@@ -28,6 +28,5 @@
"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"
}
diff --git 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
index 5e2f26dc1dace..af8a771af2e34 100644
--- 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
@@ -28,7 +28,6 @@
"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"
}
diff --git 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
index 68feec852a97a..51e2c44f2d8ba 100644
--- 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
@@ -28,7 +28,6 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
index 4ed17c48705f9..126c3bd37000f 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
@@ -28,6 +28,5 @@
"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"
}
diff --git a/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py b/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
index fce75aeb3509b..e6688ad0339ab 100644
--- a/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
+++ b/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
@@ -34,7 +34,6 @@ config = {
"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": [
diff --git a/testing/mozharness/configs/single_locale/ash_android-api-16.py b/testing/mozharness/configs/single_locale/ash_android-api-16.py
index 2afa3f6c36f75..cba3a6b0b15ba 100644
--- a/testing/mozharness/configs/single_locale/ash_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-16.py
@@ -49,12 +49,10 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/date_android-api-16.py b/testing/mozharness/configs/single_locale/date_android-api-16.py
index e6f4d2f63afaa..76ac4e75831d5 100644
--- a/testing/mozharness/configs/single_locale/date_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/date_android-api-16.py
@@ -47,12 +47,10 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/jamun_android-api-16.py b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
index e887d0d11811c..2e5b22e0bc10d 100644
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
@@ -46,12 +46,10 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/linux.py b/testing/mozharness/configs/single_locale/linux.py
index 85986d7ef1890..e0ec0e3e75ba6 100644
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -8,10 +8,8 @@ config = {
"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',
@@ -31,7 +29,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/linux64.py b/testing/mozharness/configs/single_locale/linux64.py
index d0abd3ce33637..1e868d174c40a 100644
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -8,10 +8,8 @@ config = {
"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',
@@ -31,7 +29,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/linux64_devedition.py b/testing/mozharness/configs/single_locale/linux64_devedition.py
index 45833ecaa03a0..c22c1d549d0a4 100644
--- a/testing/mozharness/configs/single_locale/linux64_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@@ -8,10 +8,8 @@ config = {
"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',
@@ -31,7 +29,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/linux_devedition.py b/testing/mozharness/configs/single_locale/linux_devedition.py
index 20548fc8b066a..d19d526497802 100644
--- a/testing/mozharness/configs/single_locale/linux_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@@ -8,10 +8,8 @@ config = {
"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',
@@ -31,7 +29,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/macosx64.py b/testing/mozharness/configs/single_locale/macosx64.py
index 09a6e86b853d3..37a9187c8c90c 100644
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -14,10 +14,8 @@ config = {
"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",
@@ -39,7 +37,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/macosx64_devedition.py b/testing/mozharness/configs/single_locale/macosx64_devedition.py
index fb7081f9e8627..352dff39afb8f 100644
--- a/testing/mozharness/configs/single_locale/macosx64_devedition.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@@ -14,10 +14,8 @@ config = {
"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",
@@ -39,7 +37,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
index dac95682df846..b8a42f7f082a8 100644
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
@@ -53,12 +53,10 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
index 4158ff71413e9..78bbd3a74b801 100644
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
@@ -51,12 +51,10 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
index 6057f80a3f915..3f139ca49c635 100644
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
@@ -53,12 +53,10 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
index 09a68cc6138c0..646164d580820 100644
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
@@ -51,12 +51,10 @@ config = {
"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",
diff --git 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
index 3e0f928a9ec98..d1d46c447678c 100644
--- 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
@@ -51,14 +51,12 @@ config = {
"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",
diff --git 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
index aecc77deddc2a..db6ce33cd7c6d 100644
--- 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
@@ -51,14 +51,12 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/tc_linux32.py b/testing/mozharness/configs/single_locale/tc_linux32.py
index 965f900908101..c289341acc26e 100644
--- a/testing/mozharness/configs/single_locale/tc_linux32.py
+++ b/testing/mozharness/configs/single_locale/tc_linux32.py
@@ -10,10 +10,8 @@ config = {
"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'),
diff --git a/testing/mozharness/configs/single_locale/tc_linux64.py b/testing/mozharness/configs/single_locale/tc_linux64.py
index 4a92a0612d9cb..76c34208b7e40 100644
--- a/testing/mozharness/configs/single_locale/tc_linux64.py
+++ b/testing/mozharness/configs/single_locale/tc_linux64.py
@@ -10,10 +10,8 @@ config = {
"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'),
diff --git a/testing/mozharness/configs/single_locale/tc_macosx64.py b/testing/mozharness/configs/single_locale/tc_macosx64.py
index bf64cb9071fa9..54e1dc86adb33 100644
--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -10,10 +10,8 @@ config = {
"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'),
diff --git a/testing/mozharness/configs/single_locale/tc_win32.py b/testing/mozharness/configs/single_locale/tc_win32.py
index 65c9404e42a29..368b05dae0ba3 100644
--- a/testing/mozharness/configs/single_locale/tc_win32.py
+++ b/testing/mozharness/configs/single_locale/tc_win32.py
@@ -15,10 +15,8 @@ config = {
"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'),
diff --git a/testing/mozharness/configs/single_locale/tc_win64.py b/testing/mozharness/configs/single_locale/tc_win64.py
index b1d51f088eaf1..eed5138f1054a 100644
--- a/testing/mozharness/configs/single_locale/tc_win64.py
+++ b/testing/mozharness/configs/single_locale/tc_win64.py
@@ -15,10 +15,8 @@ config = {
"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'),
diff --git a/testing/mozharness/configs/single_locale/try_android-api-16.py b/testing/mozharness/configs/single_locale/try_android-api-16.py
index 12557203b8f0f..950a319902635 100644
--- a/testing/mozharness/configs/single_locale/try_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-16.py
@@ -52,12 +52,10 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/win32.py b/testing/mozharness/configs/single_locale/win32.py
index ac35eddb5dab0..137d9c5d36bf4 100644
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -9,7 +9,6 @@ config = {
"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",
@@ -42,7 +41,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/win32_devedition.py b/testing/mozharness/configs/single_locale/win32_devedition.py
index c999cc533bdaf..2e6afc81f8b70 100644
--- a/testing/mozharness/configs/single_locale/win32_devedition.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@@ -9,7 +9,6 @@ config = {
"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",
@@ -42,7 +41,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/win64.py b/testing/mozharness/configs/single_locale/win64.py
index c20d0fba18473..3c5ba7b15ce1d 100644
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -11,7 +11,6 @@ config = {
"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;'
@@ -42,7 +41,6 @@ config = {
"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",
diff --git a/testing/mozharness/configs/single_locale/win64_devedition.py b/testing/mozharness/configs/single_locale/win64_devedition.py
index b69554288a3b9..14c6750bb99d7 100644
--- a/testing/mozharness/configs/single_locale/win64_devedition.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@@ -11,7 +11,6 @@ config = {
"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;'
@@ -42,7 +41,6 @@ config = {
"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",
--
GitLab