--- a/testing/mozharness/configs/b2g/desktop_linux32.py
+++ b/testing/mozharness/configs/b2g/desktop_linux32.py
@@ -15,19 +15,16 @@ config = {
'setup-mock',
'build',
'upload-files',
'sendchange',
'check-test',
],
"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',
# mock shtuff
'mock_mozilla_dir': '/builds/mock_mozilla',
'mock_target': 'mozilla-centos6-x86_64',
'mock_files': [
('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
--- a/testing/mozharness/configs/b2g/desktop_macosx64.py
+++ b/testing/mozharness/configs/b2g/desktop_macosx64.py
@@ -12,19 +12,16 @@ config = {
'build',
'upload-files',
'sendchange',
'check-test',
],
"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',
'enable_ccache': True,
'vcs_share_base': '/builds/hg-shared',
'objdir': 'obj-firefox',
'tooltool_script': ["/builds/tooltool.py"],
'tooltool_bootstrap': "setup.sh",
--- a/testing/mozharness/configs/b2g/desktop_windows32.py
+++ b/testing/mozharness/configs/b2g/desktop_windows32.py
@@ -16,22 +16,16 @@ config = {
'build',
'upload-files',
'sendchange',
'check-test',
],
"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'
- )
- ],
'gittool.py': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'tools', 'buildfarm', 'utils', 'gittool.py'
)
],
"buildbot": [
sys.executable,
--- a/testing/mozharness/configs/b2g/releng-emulator.py
+++ b/testing/mozharness/configs/b2g/releng-emulator.py
@@ -31,18 +31,17 @@ config = {
"ssh_user": "ffxbld",
"upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
"post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
"post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
},
},
"gittool_share_base": "/builds/git-shared/git",
"gittool_base_mirror_urls": [],
- "hgtool_share_base": "/builds/hg-shared",
- "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],
+ "vcs_share_base": "/builds/hg-shared",
"sendchange_masters": ["buildbot-master81.build.mozilla.org:9301"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
"buildbot": "/tools/buildbot/bin/buildbot",
},
"manifest": {
"upload_remote_host": "stage.mozilla.org",
"upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
--- a/testing/mozharness/configs/b2g/releng-fota-eng.py
+++ b/testing/mozharness/configs/b2g/releng-fota-eng.py
@@ -31,18 +31,17 @@ config = {
"ssh_user": "ffxbld",
"upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
"post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
"post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
},
},
"gittool_share_base": "/builds/git-shared/git",
"gittool_base_mirror_urls": [],
- "hgtool_share_base": "/builds/hg-shared",
- "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],
+ "vcs_share_base": "/builds/hg-shared",
"exes": {
"tooltool.py": "/tools/tooltool.py",
"python": "/tools/python27/bin/python2.7",
},
"manifest": {
"upload_remote_host": "stage.mozilla.org",
"upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
"depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
--- a/testing/mozharness/configs/b2g/releng-fota-updates.py
+++ b/testing/mozharness/configs/b2g/releng-fota-updates.py
@@ -32,18 +32,17 @@ config = {
"ssh_user": "ffxbld",
"upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
"post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
"post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
},
},
"gittool_share_base": "/builds/git-shared/git",
"gittool_base_mirror_urls": [],
- "hgtool_share_base": "/builds/hg-shared",
- "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],
+ "vcs_share_base": "/builds/hg-shared",
"exes": {
"tooltool.py": "/tools/tooltool.py",
},
"manifest": {
"upload_remote_host": "stage.mozilla.org",
"upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
"depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
--- a/testing/mozharness/configs/b2g/releng-otoro-eng.py
+++ b/testing/mozharness/configs/b2g/releng-otoro-eng.py
@@ -31,18 +31,17 @@ config = {
"ssh_user": "ffxbld",
"upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
"post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
"post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
},
},
"gittool_share_base": "/builds/git-shared/git",
"gittool_base_mirror_urls": [],
- "hgtool_share_base": "/builds/hg-shared",
- "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],
+ "vcs_share_base": "/builds/hg-shared",
"exes": {
"tooltool.py": "/tools/tooltool.py",
"python": "/tools/python27/bin/python2.7",
},
"manifest": {
"upload_remote_host": "stage.mozilla.org",
"upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
"depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
--- a/testing/mozharness/configs/b2g/releng-otoro.py
+++ b/testing/mozharness/configs/b2g/releng-otoro.py
@@ -31,18 +31,17 @@ config = {
"ssh_user": "ffxbld",
"upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
"post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
"post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
},
},
"gittool_share_base": "/builds/git-shared/git",
"gittool_base_mirror_urls": [],
- "hgtool_share_base": "/builds/hg-shared",
- "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],
+ "vcs_share_base": "/builds/hg-shared",
"exes": {
"tooltool.py": "/tools/tooltool.py",
},
"manifest": {
"upload_remote_host": "stage.mozilla.org",
"upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
"depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
--- a/testing/mozharness/configs/b2g/releng-private-updates.py
+++ b/testing/mozharness/configs/b2g/releng-private-updates.py
@@ -32,18 +32,17 @@ config = {
"ssh_user": "ffxbld",
"upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
"post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
"post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
},
},
"gittool_share_base": "/builds/git-shared/git",
"gittool_base_mirror_urls": [],
- "hgtool_share_base": "/builds/hg-shared",
- "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],
+ "vcs_share_base": "/builds/hg-shared",
"exes": {
"tooltool.py": "/tools/tooltool.py",
},
"manifest": {
"upload_remote_host": "stage.mozilla.org",
"upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
"depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
--- a/testing/mozharness/configs/b2g/releng-try.py
+++ b/testing/mozharness/configs/b2g/releng-try.py
@@ -17,18 +17,17 @@ config = {
"ssh_user": "b2gtry",
"upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
"upload_remote_path": "/pub/mozilla.org/b2g/try-builds/%(user)s-%(revision)s/%(branch)s-%(target)s",
"upload_dep_target_exclusions": [],
},
},
"gittool_share_base": "/builds/git-shared/git",
"gittool_base_mirror_urls": [],
- "hgtool_share_base": "/builds/hg-shared",
- "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],
+ "vcs_share_base": "/builds/hg-shared",
"sendchange_masters": ["buildbot-master81.build.mozilla.org:9301"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
"buildbot": "/tools/buildbot/bin/buildbot",
},
"env": {
"CCACHE_DIR": "/builds/ccache",
"CCACHE_COMPRESS": "1",
--- a/testing/mozharness/scripts/b2g_build.py
+++ b/testing/mozharness/scripts/b2g_build.py
@@ -125,28 +125,28 @@ class B2GBuild(LocalesMixin, PurgeMixin,
}],
]
def __init__(self, require_config_file=False, config={},
all_actions=all_actions,
default_actions=default_actions):
# Default configuration
default_config = {
- 'default_vcs': 'hgtool',
+ 'default_vcs': 'hg',
'ccache': True,
'locales_dir': 'gecko/b2g/locales',
'l10n_dir': 'gecko-l10n',
'ignore_locales': ['en-US', 'multi'],
'locales_file': 'gecko/b2g/locales/all-locales',
'mozilla_dir': 'build/gecko',
'objdir': 'build/objdir-gecko',
'merge_locales': True,
'compare_locales_repo': 'https://hg.mozilla.org/build/compare-locales',
'compare_locales_rev': 'RELEASE_AUTOMATION',
- 'compare_locales_vcs': 'hgtool',
+ 'compare_locales_vcs': 'hg',
'repo_remote_mappings': {},
'influx_credentials_file': 'oauth.txt',
'balrog_credentials_file': 'oauth.txt',
'build_resources_path': '%(abs_obj_dir)s/.mozbuild/build_resources.json',
'virtualenv_modules': [
'requests==2.8.1',
],
'virtualenv_path': 'venv',