--- a/testing/mozharness/configs/builds/build_pool_specifics.py
+++ b/testing/mozharness/configs/builds/build_pool_specifics.py
@@ -7,36 +7,29 @@ config = {
# if true: possibly clobber, clobberer
# see PurgeMixin for clobber() conditions
'clobberer_url': 'https://api-pub-build.allizom.org/clobberer/lastclobber',
# staging we should use MozillaTest
# but in production we let the self.branch decide via
# self._query_graph_server_branch_name()
"graph_server_branch_name": "MozillaTest",
'graph_server': 'graphs.allizom.org',
- "hgtool_base_bundle_urls": [
- 'http://dev-stage01.build.mozilla.org/pub/mozilla'
- '.org/firefox/bundles',
- ],
'stage_server': 'upload.ffxbld.productdelivery.stage.mozaws.net',
"sendchange_masters": ["dev-master1.srv.releng.scl3.mozilla.com:9038"],
'taskcluster_index': 'index.garbage.staging',
'post_upload_extra': ['--bucket-prefix', 'net-mozaws-stage-delivery',
'--url-prefix', 'http://ftp.stage.mozaws.net/',
],
},
"production": {
# if not clobberer_url, only clobber 'abs_work_dir'
# if true: possibly clobber, clobberer
# see PurgeMixin for clobber() conditions
'clobberer_url': 'https://api.pub.build.mozilla.org/clobberer/lastclobber',
'graph_server': 'graphs.mozilla.org',
- "hgtool_base_bundle_urls": [
- 'https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles'
- ],
# bug 1216907, set this at branch level
# 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
"sendchange_masters": ["buildbot-master81.build.mozilla.org:9301"],
'taskcluster_index': 'index',
},
"taskcluster": {
'graph_server': 'graphs.mozilla.org',
'stage_server': 'ignored',
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -14,19 +14,16 @@ config = {
'upload-files',
'sendchange',
'multi-l10n',
'generate-build-stats',
'update', # decided by query_is_nightly()
],
"buildbot_json_path": "buildprops.json",
'exes': {
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
"buildbot": "/tools/buildbot/bin/buildbot",
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
'enable_signing': True,
# mock shtuff
'mock_mozilla_dir': '/builds/mock_mozilla',
'mock_target': 'mozilla-centos6-x86_64-android',
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -18,19 +18,16 @@ config = {
'upload-files',
'sendchange',
'check-test',
'generate-build-stats',
'update', # decided by query_is_nightly()
],
"buildbot_json_path": "buildprops.json",
'exes': {
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
"buildbot": "/tools/buildbot/bin/buildbot",
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
'enable_signing': True,
# mock shtuff
'mock_mozilla_dir': '/builds/mock_mozilla',
'mock_target': 'mozilla-centos6-x86_64',
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -17,19 +17,16 @@ config = {
'upload-files',
'sendchange',
'check-test',
'generate-build-stats',
'update', # decided by query_is_nightly()
],
"buildbot_json_path": "buildprops.json",
'exes': {
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
"buildbot": "/tools/buildbot/bin/buildbot",
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
'enable_signing': True,
# mock shtuff
'mock_mozilla_dir': '/builds/mock_mozilla',
'mock_target': 'mozilla-centos6-x86_64',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
@@ -15,19 +15,16 @@ config = {
'sendchange',
'check-test',
'generate-build-stats',
'update', # decided by query_is_nightly()
],
"buildbot_json_path": "buildprops.json",
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
"buildbot": "/tools/buildbot/bin/buildbot",
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
'enable_signing': True,
'enable_ccache': True,
'vcs_share_base': '/builds/hg-shared',
'objdir': 'obj-firefox/x86_64',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@@ -12,19 +12,16 @@ config = {
'checkout-sources',
'build',
'generate-build-stats',
'update', # decided by query_is_nightly()
],
"buildbot_json_path": "buildprops.json",
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
"buildbot": "/tools/buildbot/bin/buildbot",
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
'enable_signing': True,
'enable_ccache': True,
'enable_check_test': False,
'vcs_share_base': '/builds/hg-shared',
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -19,22 +19,16 @@ config = {
'sendchange',
'check-test',
'generate-build-stats',
'update', # decided by query_is_nightly()
],
"buildbot_json_path": "buildprops.json",
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
"buildbot": [
sys.executable,
'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
],
"make": [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -19,22 +19,16 @@ config = {
'sendchange',
'check-test',
'generate-build-stats',
'update', # decided by query_is_nightly()
],
"buildbot_json_path": "buildprops.json",
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
"buildbot": [
sys.executable,
'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
],
"make": [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_debug.py
@@ -14,22 +14,16 @@ config = {
'default_actions': [
'clone-tools',
'build',
'check-test',
],
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
'virtualenv': [
sys.executable,
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_opt.py
@@ -14,22 +14,16 @@ config = {
'default_actions': [
'clone-tools',
'build',
'check-test',
],
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
'virtualenv': [
sys.executable,
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_debug.py
@@ -14,22 +14,16 @@ config = {
'default_actions': [
'clone-tools',
'build',
'check-test',
],
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
'virtualenv': [
sys.executable,
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_opt.py
@@ -14,22 +14,16 @@ config = {
'default_actions': [
'clone-tools',
'build',
'check-test',
],
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
'virtualenv': [
sys.executable,
--- a/testing/mozharness/configs/developer_config.py
+++ b/testing/mozharness/configs/developer_config.py
@@ -18,17 +18,16 @@ config = {
"developer_mode": True,
"local_workdir": LOCAL_WORKDIR,
"replace_urls": [
("http://pvtbuilds.pvt.build", "https://pvtbuilds"),
],
# General local variable overwrite
"exes": {
- "hgtool.py": os.path.join(LOCAL_WORKDIR, "hgtool.py"),
"gittool.py": os.path.join(LOCAL_WORKDIR, "gittool.py"),
},
"env": {
"PIP_TRUSTED_HOST": "pypi.pub.build.mozilla.org",
},
# Pip
"find_links": ["http://pypi.pub.build.mozilla.org/pub"],
@@ -41,14 +40,13 @@ config = {
"postflight_run_cmd_suites": [],
# Tooltool related
"download_tooltool": True,
"tooltool_cache": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
"tooltool_cache_path": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
# VCS tools
- "hgtool.py": 'http://hg.mozilla.org/build/puppet/raw-file/faaf5abd792e/modules/packages/files/hgtool.py',
"gittool.py": 'http://hg.mozilla.org/build/puppet/raw-file/faaf5abd792e/modules/packages/files/gittool.py',
# Android related
"host_utils_url": "https://api.pub.build.mozilla.org/tooltool/sha512/372c89f9dccaf5ee3b9d35fd1cfeb089e1e5db3ff1c04e35aa3adc8800bc61a2ae10e321f37ae7bab20b56e60941f91bb003bcb22035902a73d70872e7bd3282",
}
--- a/testing/mozharness/configs/firefox_ui_tests/releng_release.py
+++ b/testing/mozharness/configs/firefox_ui_tests/releng_release.py
@@ -19,21 +19,16 @@ config = {
# General local variable overwrite
'exes': {
'gittool.py': [
# Bug 1227079 - Python executable eeded to get it executed on Windows
sys.executable,
os.path.join(external_tools_path, 'gittool.py')
],
- 'hgtool.py': [
- # Bug 1227079 - Python executable eeded to get it executed on Windows
- sys.executable,
- os.path.join(external_tools_path, 'hgtool.py')
- ],
},
# PIP
'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
'pip_index': False,
# mozcrash support
'download_minidump_stackwalk': True,
--- a/testing/mozharness/configs/mediatests/buildbot_windows_config.py
+++ b/testing/mozharness/configs/mediatests/buildbot_windows_config.py
@@ -12,20 +12,16 @@ config = {
"virtualenv_path": 'venv',
"exes": {
'python': 'c:/mozilla-build/python27/python',
'virtualenv': ['c:/mozilla-build/python27/python', 'c:/mozilla-build/buildbotve/virtualenv.py'],
'hg': 'c:/mozilla-build/hg/hg',
'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
'tooltool.py': [sys.executable, 'C:/mozilla-build/tooltool.py'],
- 'hgtool.py': [sys.executable,
- os.path.join(external_tools_path, 'hgtool.py')],
-
-
},
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
--- a/testing/mozharness/configs/multi_locale/ash_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/ash_android-x86.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/projects/ash",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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/ash_android.json
+++ b/testing/mozharness/configs/multi_locale/ash_android.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/projects/ash",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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-aurora_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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-aurora_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-beta",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-beta",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-beta",
"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
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "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
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-release",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-release",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
@@ -2,25 +2,25 @@
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/mobile/android/locales/maemo-locales",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
- "tag": "default",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
- "tag": "default",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
- "tag": "default",
+ "branch": "default",
"dest": "tools"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
"hg_l10n_tag": "default",
"l10n_dir": "mozilla-release",
"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
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/releases/l10n/mozilla-beta",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/releases/l10n/mozilla-beta",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/releases/l10n/mozilla-beta",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-beta",
"merge_locales": true,
"mozilla_dir": "build"
--- a/testing/mozharness/configs/multi_locale/release_mozilla-esr_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-esr_android-armv6.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-esr31.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-esr31",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/releases/l10n/mozilla-release",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-esr31",
"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
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/releases/l10n/mozilla-release",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/releases/l10n/mozilla-release",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
"merge_locales": true,
"mozilla_dir": "build",
--- a/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/releases/l10n/mozilla-release",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-release",
"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
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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-esr_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-esr_android-armv6.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-esr31.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-esr31",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/users/stage-ffxbld",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-esr31",
"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
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/staging_release_mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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/staging_release_mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
@@ -3,26 +3,30 @@
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
+ "branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
+ "branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
+ "branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"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
@@ -20,17 +20,17 @@ config = {
"work_dir": ".",
"log_name": "multilocale",
"objdir": OBJDIR,
"locales_file": "%s/%s/locales/maemo-locales" % (BUILD_DIR, ANDROID_DIR),
"locales_dir": "%s/locales" % ANDROID_DIR,
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%s" % REPO_PATH,
- "tag": "default",
+ "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,
--- a/testing/mozharness/configs/releng_infra_configs/builders.py
+++ b/testing/mozharness/configs/releng_infra_configs/builders.py
@@ -5,36 +5,33 @@ from mozharness.base.script import platf
# These are values specific to each platform on Release Engineering machines
PYTHON_WIN32 = 'c:/mozilla-build/python27/python.exe'
# These are values specific to running machines on Release Engineering machines
# to run it locally on your machines append --cfg developer_config.py
PLATFORM_CONFIG = {
'linux64': {
'exes': {
'gittool.py': '/usr/local/bin/gittool.py',
- 'hgtool.py': '/usr/local/bin/hgtool.py',
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
},
'env': {
'DISPLAY': ':2',
}
},
'macosx': {
'exes': {
'gittool.py': '/usr/local/bin/gittool.py',
- 'hgtool.py': '/usr/local/bin/hgtool.py',
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
},
},
'win32': {
"exes": {
'gittool.py': [PYTHON_WIN32, 'c:/builds/hg-shared/build/tools/buildfarm/utils/gittool.py'],
- 'hgtool.py': [PYTHON_WIN32, 'c:/builds/hg-shared/build/tools/buildfarm/utils/hgtool.py'],
# Otherwise, depending on the PATH we can pick python 2.6 up
'python': PYTHON_WIN32,
'virtualenv': [PYTHON_WIN32, 'c:/mozilla-build/buildbotve/virtualenv.py'],
}
}
}
config = PLATFORM_CONFIG[platform_name()]
--- a/testing/mozharness/configs/releng_infra_configs/testers.py
+++ b/testing/mozharness/configs/releng_infra_configs/testers.py
@@ -14,49 +14,45 @@ external_tools_path = os.path.join(
# These are values specific to each platform on Release Engineering machines
PYTHON_WIN32 = 'c:/mozilla-build/python27/python.exe'
# These are values specific to running machines on Release Engineering machines
# to run it locally on your machines append --cfg developer_config.py
PLATFORM_CONFIG = {
'linux': {
'exes': {
'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
- 'hgtool.py': os.path.join(external_tools_path, 'hgtool.py'),
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
},
'env': {
'DISPLAY': ':0',
'PATH': '%(PATH)s:' + external_tools_path,
}
},
'linux64': {
'exes': {
'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
- 'hgtool.py': os.path.join(external_tools_path, 'hgtool.py'),
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
},
'env': {
'DISPLAY': ':0',
'PATH': '%(PATH)s:' + external_tools_path,
}
},
'macosx': {
'exes': {
'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
- 'hgtool.py': os.path.join(external_tools_path, 'hgtool.py'),
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
},
'env': {
'PATH': '%(PATH)s:' + external_tools_path,
}
},
'win32': {
"exes": {
'gittool.py': [PYTHON_WIN32, os.path.join(external_tools_path, 'gittool.py')],
- 'hgtool.py': [PYTHON_WIN32, os.path.join(external_tools_path, 'hgtool.py')],
# Otherwise, depending on the PATH we can pick python 2.6 up
'python': PYTHON_WIN32,
'virtualenv': [PYTHON_WIN32, 'c:/mozilla-build/buildbotve/virtualenv.py'],
}
}
}
config = PLATFORM_CONFIG[platform_name()]
--- a/testing/mozharness/configs/single_locale/alder.py
+++ b/testing/mozharness/configs/single_locale/alder.py
@@ -32,16 +32,16 @@ config = {
# repositories
"mozilla_dir": "alder",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/mozilla-central",
- "revision": "default",
+ "branch": "default",
"dest": "alder",
}],
# purge options
'is_automation': True,
}
--- a/testing/mozharness/configs/single_locale/ash.py
+++ b/testing/mozharness/configs/single_locale/ash.py
@@ -32,16 +32,16 @@ config = {
# repositories
"mozilla_dir": "ash",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/mozilla-central",
- "revision": "default",
+ "branch": "default",
"dest": "ash",
}],
# purge options
'is_automation': True,
}
--- a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
@@ -13,19 +13,19 @@ config = {
# staging beta dev releases use date repo for now
"mozilla_dir": "date",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/projects/date",
- "revision": "default",
+ "branch": "default",
"dest": "date",
}],
# purge options
'is_automation': True,
'purge_minsize': 12,
'default_actions': [
"clobber",
"pull",
--- a/testing/mozharness/configs/single_locale/dev-mozilla-release.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-release.py
@@ -11,19 +11,19 @@ config = {
# staging release uses jamun
"mozilla_dir": "jamun",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/projects/jamun",
- "revision": "default",
+ "branch": "default",
"dest": "jamun",
}],
# purge options
'purge_minsize': 12,
'is_automation': True,
'default_actions': [
"clobber",
"pull",
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -115,14 +115,9 @@ config = {
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/relengapi.tok', '/builds/relengapi.tok'),
('/tools/tooltool.py', '/builds/tooltool.py'),
('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
],
- 'exes': {
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
- },
}
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -95,14 +95,9 @@ config = {
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
('/home/cltbld/.hgrc', '/builds/.hgrc'),
('/home/cltbld/.boto', '/builds/.boto'),
('/builds/gapi.data', '/builds/gapi.data'),
('/builds/relengapi.tok', '/builds/relengapi.tok'),
('/tools/tooltool.py', '/builds/tooltool.py'),
('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
],
- 'exes': {
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
- },
}
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -64,14 +64,9 @@ config = {
"local_mar_tool_dir": "dist/host/bin",
"mar": "mar",
"mbsdiff": "mbsdiff",
"current_mar_filename": "firefox-%(version)s.%(locale)s.mac.complete.mar",
"complete_mar": "firefox-%(version)s.en-US.mac.complete.mar",
"localized_mar": "firefox-%(version)s.%(locale)s.mac.complete.mar",
"partial_mar": "firefox-%(version)s.%(locale)s.mac.partial.%(from_buildid)s-%(to_buildid)s.mar",
'installer_file': "firefox-%(version)s.en-US.mac.dmg",
- 'exes': {
- 'hgtool.py': os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- ),
- },
}
--- a/testing/mozharness/configs/single_locale/mozilla-aurora.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora.py
@@ -14,16 +14,16 @@ config = {
# repositories
"mozilla_dir": "mozilla-aurora",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
- "revision": "default",
+ "branch": "default",
"dest": "mozilla-aurora",
}],
# purge options
'is_automation': True,
}
--- a/testing/mozharness/configs/single_locale/mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta.py
@@ -11,17 +11,17 @@ config = {
# repositories
"mozilla_dir": "mozilla-beta",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
"revision": "%(revision)s",
"dest": "mozilla-beta",
}],
# purge options
'purge_minsize': 12,
'is_automation': True,
'default_actions': [
--- a/testing/mozharness/configs/single_locale/mozilla-central.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central.py
@@ -14,16 +14,16 @@ config = {
# repositories
"mozilla_dir": "mozilla-central",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/mozilla-central",
- "revision": "default",
+ "revision": "%(revision)s",
"dest": "mozilla-central",
}],
# purge options
'is_automation': True,
}
--- a/testing/mozharness/configs/single_locale/mozilla-esr45.py
+++ b/testing/mozharness/configs/single_locale/mozilla-esr45.py
@@ -11,17 +11,17 @@ config = {
# repositories
"mozilla_dir": "mozilla-esr45",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/releases/mozilla-esr45",
"revision": "%(revision)s",
"dest": "mozilla-esr45",
}],
# purge options
'purge_minsize': 12,
'is_automation': True,
'default_actions': [
--- a/testing/mozharness/configs/single_locale/mozilla-release.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release.py
@@ -11,17 +11,17 @@ config = {
# repositories
"mozilla_dir": "mozilla-release",
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/releases/mozilla-release",
"revision": "%(revision)s",
"dest": "mozilla-release",
}],
# purge options
'purge_minsize': 12,
'is_automation': True,
'default_actions': [
--- a/testing/mozharness/configs/single_locale/try.py
+++ b/testing/mozharness/configs/single_locale/try.py
@@ -9,24 +9,23 @@ config = {
# 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",
# repositories
"mozilla_dir": "try",
- "hgtool_base_bundle_urls": ["https://archive.mozilla.org/pub/firefox/bundles"],
"repos": [{
"vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools",
}, {
- "vcs": "hgtool",
+ "vcs": "hg",
"repo": "https://hg.mozilla.org/try",
"revision": "%(revision)s",
"dest": "try",
"clone_upstream_url": "https://hg.mozilla.org/mozilla-central",
"clone_by_revision": True,
"clone_with_purge": True,
}],
# purge options
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -64,20 +64,14 @@ config = {
"localized_mar": "firefox-%(version)s.%(locale)s.win32.complete.mar",
"partial_mar": "firefox-%(version)s.%(locale)s.win32.partial.%(from_buildid)s-%(to_buildid)s.mar",
'installer_file': "firefox-%(version)s.en-US.win32.installer.exe",
# use mozmake?
"enable_mozmake": True,
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
'virtualenv': [
sys.executable,
'c:/mozilla-build/buildbotve/virtualenv.py'
],
}
}
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -64,20 +64,14 @@ config = {
"localized_mar": "firefox-%(version)s.%(locale)s.win64.complete.mar",
"partial_mar": "firefox-%(version)s.%(locale)s.win64.partial.%(from_buildid)s-%(to_buildid)s.mar",
'installer_file': "firefox-%(version)s.en-US.win64.installer.exe",
# use mozmake?
"enable_mozmake": True,
'exes': {
'python2.7': sys.executable,
- 'hgtool.py': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'hgtool.py'
- )
- ],
'virtualenv': [
sys.executable,
'c:/mozilla-build/buildbotve/virtualenv.py'
],
}
}
--- a/testing/mozharness/mozharness/mozilla/building/buildb2gbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildb2gbase.py
@@ -357,17 +357,18 @@ class B2GBuildBaseScript(BuildbotMixin,
def checkout_tools(self):
dirs = self.query_abs_dirs()
# We need hg.m.o/build/tools checked out
self.info("Checking out tools")
repos = [{
'repo': self.config['tools_repo'],
- 'vcs': "hg", # May not have hgtool yet
+ 'vcs': "hg",
+ 'branch': "default",
'dest': dirs['abs_tools_dir'],
}]
rev = self.vcs_checkout(**repos[0])
self.set_buildbot_property("tools_revision", rev, write_to_file=True)
def checkout_sources(self):
dirs = self.query_abs_dirs()
gecko_config = self.load_gecko_config()
--- a/testing/mozharness/scripts/firefox_ui_tests/update_release.py
+++ b/testing/mozharness/scripts/firefox_ui_tests/update_release.py
@@ -99,18 +99,18 @@ class ReleaseFirefoxUIUpdateTests(Firefo
"""
dirs = self.query_abs_dirs()
super(ReleaseFirefoxUIUpdateTests, self).checkout()
self.vcs_checkout(
repo=self.tools_repo,
dest=dirs['abs_tools_dir'],
- revision=self.tools_tag,
- vcs='hgtool'
+ branch=self.tools_tag,
+ vcs='hg'
)
def query_abs_dirs(self):
if self.abs_dirs:
return self.abs_dirs
abs_dirs = super(ReleaseFirefoxUIUpdateTests, self).query_abs_dirs()
dirs = {
--- a/testing/mozharness/scripts/merge_day/b2g_branch_repos.py
+++ b/testing/mozharness/scripts/merge_day/b2g_branch_repos.py
@@ -355,17 +355,17 @@ e.g. --branch-order v2.0,master"""
def pull(self):
""" Pull action.
"""
dirs = self.query_abs_dirs()
super(B2GBranch, self).pull(
repos=[{
"vcs": "hg",
"repo": self.config["tools_repo_url"],
- "revision": self.config["tools_repo_revision"],
+ "branch": self.config["tools_repo_revision"],
"dest": "tools",
}, {
"vcs": "gittool",
"repo": self.config["manifest_repo_url"],
"revision": self.config["manifest_repo_revision"],
"dest": dirs['abs_manifest_dir'],
}],
)
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -458,17 +458,17 @@ class GeckoMigration(MercurialScript, Ba
next_version[2] = '0'
next_version = ".".join(next_version)
for f in self.config["version_files"]:
self.replace(os.path.join(dirs['abs_to_dir'], f["file"]),
curr_version, next_version + f["suffix"])
self.touch_clobber_file(dirs['abs_to_dir'])
def pull(self):
- """ Pull tools first, then use hgtool for the gecko repos
+ """ Pull tools first, then clone the gecko repos
"""
repos = [{
"repo": self.config["tools_repo_url"],
"branch": self.config["tools_repo_branch"],
"dest": "tools",
"vcs": "hg",
}] + self.query_repos()
super(GeckoMigration, self).pull(repos=repos)
--- a/testing/mozharness/scripts/mobile_l10n.py
+++ b/testing/mozharness/scripts/mobile_l10n.py
@@ -490,17 +490,17 @@ class MobileSingleLocale(MockMixin, Loca
dirs = self.query_abs_dirs()
locales = self.query_locales()
make = self.query_exe("make")
upload_env = self.query_upload_env()
cwd = dirs['abs_locales_dir']
branch = self.config['branch']
revision = self.query_revision()
repo = self.query_l10n_repo()
- pushinfo = self.vcs_query_pushinfo(repo, revision, vcs='hgtool')
+ pushinfo = self.vcs_query_pushinfo(repo, revision, vcs='hg')
pushdate = time.strftime('%Y%m%d%H%M%S', time.gmtime(pushinfo.pushdate))
routes_json = os.path.join(self.query_abs_dirs()['abs_mozilla_dir'],
'taskcluster/ci/legacy/routes.json')
with open(routes_json) as routes_file:
contents = json.load(routes_file)
templates = contents['l10n']
for locale in locales:
@@ -596,17 +596,18 @@ class MobileSingleLocale(MockMixin, Loca
def checkout_tools(self):
dirs = self.query_abs_dirs()
# We need hg.m.o/build/tools checked out
self.info("Checking out tools")
repos = [{
'repo': self.config['tools_repo'],
- 'vcs': "hg", # May not have hgtool yet
+ 'vcs': "hg",
+ 'branch': "default",
'dest': dirs['abs_tools_dir'],
}]
rev = self.vcs_checkout(**repos[0])
self.set_buildbot_property("tools_revision", rev, write_to_file=True)
def query_apkfile_path(self,locale):
dirs = self.query_abs_dirs()
--- a/testing/mozharness/scripts/release/generate-checksums.py
+++ b/testing/mozharness/scripts/release/generate-checksums.py
@@ -224,17 +224,18 @@ class ChecksumsGenerator(BaseScript, Vir
output_file.write("{} {}\n".format(self.checksums[fn]["hashes"][fmt], fn))
def sign(self):
dirs = self.query_abs_dirs()
tools_dir = path.join(dirs["abs_work_dir"], "tools")
self.vcs_checkout(
repo=self.config["tools_repo"],
- vcs="hgtool",
+ branch="default",
+ vcs="hg",
dest=tools_dir,
)
sign_cmd = self.query_moz_sign_cmd(formats=["gpg"])
for fmt in self.config["formats"]:
sums = self._get_sums_filename(fmt)
self.info("Signing big checksums file: {}".format(sums))
--- a/testing/mozharness/scripts/spidermonkey_build.py
+++ b/testing/mozharness/scripts/spidermonkey_build.py
@@ -356,16 +356,17 @@ class SpidermonkeyBuild(MockMixin,
# this has the danger of clobbering <source>/tools/
if self.config['source']:
srcdir = self.config['source']
if os.path.samefile(srcdir, os.path.dirname(dirs['abs_tools_dir'])):
raise Exception("Cannot run from source checkout to avoid overwriting subdirs")
rev = self.vcs_checkout(
vcs='hg',
+ branch="default",
repo=self.config['tools_repo'],
clean=False,
dest=dirs['abs_tools_dir'],
)
self.set_buildbot_property("tools_revision", rev, write_to_file=True)
def do_checkout_source(self):
# --source option means to use an existing source directory instead of checking one out.