--- a/configs/android/androidarm.py
+++ b/configs/android/androidarm.py
@@ -4,17 +4,16 @@ config = {
"buildbot_json_path": "buildprops.json",
"host_utils_url": "http://talos-remote.pvt.build.mozilla.org/tegra/tegra-host-utils.Linux.1109310.2.zip",
"robocop_package_name": "org.mozilla.roboexample.test",
"device_ip": "127.0.0.1",
"default_sut_port1": "20701",
"default_sut_port2": "20700", # does not prompt for commands
"tooltool_manifest_path": "testing/config/tooltool-manifests/androidarm/releng.manifest",
"tooltool_cache": "/builds/tooltool_cache",
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"emulator_manifest": """
[
{
"size": 193383673,
"digest": "6609e8b95db59c6a3ad60fc3dcfc358b2c8ec8b4dda4c2780eb439e1c5dcc5d550f2e47ce56ba14309363070078d09b5287e372f6e95686110ff8a2ef1838221",
"algorithm": "sha512",
"filename": "android-sdk18_0.r18moz1.orig.tar.gz",
"unpack": "True"
--- a/configs/android/androidarm_4_3.py
+++ b/configs/android/androidarm_4_3.py
@@ -1,17 +1,16 @@
import os
config = {
"buildbot_json_path": "buildprops.json",
"host_utils_url": "http://talos-remote.pvt.build.mozilla.org/tegra/tegra-host-utils.Linux.1109310.2.zip",
"robocop_package_name": "org.mozilla.roboexample.test",
"tooltool_manifest_path": "testing/config/tooltool-manifests/androidarm_4_3/releng.manifest",
"tooltool_cache": "/builds/tooltool_cache",
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
".avds_dir": "/home/cltbld/.android",
"emulator_manifest": """
[
{
"size": 140097024,
"digest": "51781032335c09103e8509b1a558bf22a7119392cf1ea301c49c01bdf21ff0ceb37d260bc1c322cd9b903252429fb01830fc27e4632be30cd345c95bf4b1a39b",
"algorithm": "sha512",
"filename": "android-sdk_r24.0.2-linux.tgz",
--- a/configs/android/androidx86.py
+++ b/configs/android/androidx86.py
@@ -4,17 +4,16 @@ config = {
"buildbot_json_path": "buildprops.json",
"host_utils_url": "http://talos-remote.pvt.build.mozilla.org/tegra/tegra-host-utils.Linux.1109310.2.zip",
"robocop_package_name": "org.mozilla.roboexample.test",
"device_ip": "127.0.0.1",
"default_sut_port1": "20701",
"default_sut_port2": "20700", # does not prompt for commands
"tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86/releng.manifest",
"tooltool_cache": "/builds/tooltool_cache",
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"emulator_manifest": """
[
{
"size": 193383673,
"digest": "6609e8b95db59c6a3ad60fc3dcfc358b2c8ec8b4dda4c2780eb439e1c5dcc5d550f2e47ce56ba14309363070078d09b5287e372f6e95686110ff8a2ef1838221",
"algorithm": "sha512",
"filename": "android-sdk18_0.r18moz1.orig.tar.gz",
"unpack": "True"
--- a/configs/b2g/desktop_automation_config.py
+++ b/configs/b2g/desktop_automation_config.py
@@ -1,15 +1,14 @@
# This is a template config file for b2g desktop unittest production.
import os
config = {
# mozharness options
"application": "b2g",
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"tooltool_cache": "/builds/tooltool_cache",
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
--- a/configs/b2g/desktop_linux32.py
+++ b/configs/b2g/desktop_linux32.py
@@ -48,17 +48,16 @@ config = {
#########################################################################
###### 32 bit specific ######
'base_name': 'B2G_%(branch)s_linux32_gecko',
'platform': 'linux32_gecko',
'stage_platform': 'linux32_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
--- a/configs/b2g/desktop_linux64.py
+++ b/configs/b2g/desktop_linux64.py
@@ -48,17 +48,16 @@ config = {
#########################################################################
###### 64 bit specific ######
'base_name': 'B2G_%(branch)s_linux64_gecko',
'platform': 'linux64_gecko',
'stage_platform': 'linux64_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
--- a/configs/b2g/desktop_macosx64.py
+++ b/configs/b2g/desktop_macosx64.py
@@ -33,17 +33,16 @@ config = {
#########################################################################
###### 64 bit specific ######
'base_name': 'B2G_%(branch)s_macosx64_gecko',
'platform': 'macosx64_gecko',
'stage_platform': 'macosx64_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
'CHOWN_ROOT': '~/bin/chown_root',
'CHOWN_REVERT': '~/bin/chown_revert',
'TINDERBOX_OUTPUT': '1',
--- a/configs/b2g/desktop_windows32.py
+++ b/configs/b2g/desktop_windows32.py
@@ -60,17 +60,16 @@ config = {
#########################################################################
###### 32 bit specific ######
'base_name': 'B2G_%(branch)s_win32_gecko',
'platform': 'win32_gecko',
'stage_platform': 'win32_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/nsis-2.46u;C:/mozilla-build/python27;'
--- a/configs/b2g/emulator_automation_config.py
+++ b/configs/b2g/emulator_automation_config.py
@@ -1,17 +1,16 @@
# This is a template config file for b2g emulator unittest production.
import os
config = {
# mozharness options
"application": "b2g",
- "busybox_url": "http://tooltool.pvt.build.mozilla.org/build/sha512/0748e900821820f1a42e2f1f3fa4d9002ef257c351b9e6b78e7de0ddd0202eace351f440372fbb1ae0b7e69e8361b036f6bd3362df99e67fc585082a311fc0df",
- "xre_url": "http://tooltool.pvt.build.mozilla.org/build/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462",
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
+ "busybox_url": "https://api.pub.build.mozilla.org/tooltool/sha512/0748e900821820f1a42e2f1f3fa4d9002ef257c351b9e6b78e7de0ddd0202eace351f440372fbb1ae0b7e69e8361b036f6bd3362df99e67fc585082a311fc0df",
+ "xre_url": "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462",
"tooltool_cache": "/builds/tooltool_cache",
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
--- a/configs/b2g/gaia_integration_config.py
+++ b/configs/b2g/gaia_integration_config.py
@@ -1,25 +1,22 @@
# This is a template config file for b2g emulator unittest testing
import platform
HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
else:
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
config = {
# mozharness script options
"xre_url": xre_url,
- # mozharness configuration
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
-
"vcs_share_base": HG_SHARE_BASE_DIR,
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"find_links": [
--- a/configs/b2g/gaia_unit_production_config.py
+++ b/configs/b2g/gaia_unit_production_config.py
@@ -1,26 +1,23 @@
# This is a template config file for b2g emulator unittest testing
import platform
import os
HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
else:
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
config = {
# mozharness script options
"xre_url": xre_url,
- # mozharness configuration
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
-
"vcs_share_base": HG_SHARE_BASE_DIR,
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"find_links": [
--- a/configs/b2g/generic_config.py
+++ b/configs/b2g/generic_config.py
@@ -1,15 +1,12 @@
# This is a config with generic releng related values
import os
config = {
- # mozharness options
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
-
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
--- a/configs/b2g/releng-emulator.py
+++ b/configs/b2g/releng-emulator.py
@@ -28,17 +28,16 @@ config = {
"public": {
"ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
"ssh_user": "ffxbld",
"upload_remote_host": "stage.mozilla.org",
"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",
},
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"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"],
"sendchange_masters": ["buildbot-master81.build.mozilla.org:9301"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
"buildbot": "/tools/buildbot/bin/buildbot",
--- a/configs/b2g/releng-fota-eng.py
+++ b/configs/b2g/releng-fota-eng.py
@@ -28,17 +28,16 @@ config = {
"public": {
"ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
"ssh_user": "ffxbld",
"upload_remote_host": "stage.mozilla.org",
"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",
},
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"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"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
"python": "/tools/python27/bin/python2.7",
},
--- a/configs/b2g/releng-fota-updates.py
+++ b/configs/b2g/releng-fota-updates.py
@@ -29,17 +29,16 @@ config = {
"public": {
"ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
"ssh_user": "ffxbld",
"upload_remote_host": "stage.mozilla.org",
"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",
},
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"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"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
},
"manifest": {
--- a/configs/b2g/releng-otoro-eng.py
+++ b/configs/b2g/releng-otoro-eng.py
@@ -28,17 +28,16 @@ config = {
"public": {
"ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
"ssh_user": "ffxbld",
"upload_remote_host": "stage.mozilla.org",
"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",
},
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"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"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
"python": "/tools/python27/bin/python2.7",
},
--- a/configs/b2g/releng-otoro.py
+++ b/configs/b2g/releng-otoro.py
@@ -28,17 +28,16 @@ config = {
"public": {
"ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
"ssh_user": "ffxbld",
"upload_remote_host": "stage.mozilla.org",
"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",
},
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"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"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
},
"manifest": {
--- a/configs/b2g/releng-private-updates.py
+++ b/configs/b2g/releng-private-updates.py
@@ -29,17 +29,16 @@ config = {
"public": {
"ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
"ssh_user": "ffxbld",
"upload_remote_host": "stage.mozilla.org",
"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",
},
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"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"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
},
"manifest": {
--- a/configs/b2g/releng-try.py
+++ b/configs/b2g/releng-try.py
@@ -15,17 +15,16 @@ config = {
"default": {
"ssh_key": os.path.expanduser("~/.ssh/b2gtry_dsa"),
"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": [],
},
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"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"],
"sendchange_masters": ["buildbot-master81.build.mozilla.org:9301"],
"exes": {
"tooltool.py": "/tools/tooltool.py",
"buildbot": "/tools/buildbot/bin/buildbot",
--- a/configs/builds/releng_base_linux_32_builds.py
+++ b/configs/builds/releng_base_linux_32_builds.py
@@ -53,17 +53,16 @@ config = {
#########################################################################
#########################################################################
###### 32 bit specific ######
'base_name': 'Linux_%(branch)s',
'platform': 'linux',
'stage_platform': 'linux',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
--- a/configs/builds/releng_base_linux_64_builds.py
+++ b/configs/builds/releng_base_linux_64_builds.py
@@ -53,17 +53,16 @@ config = {
#########################################################################
#########################################################################
###### 64 bit specific ######
'base_name': 'Linux_x86-64_%(branch)s',
'platform': 'linux64',
'stage_platform': 'linux64',
- 'enable_max_vsize': False,
'use_platform_in_symbols_extra_buildid': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
--- a/configs/builds/releng_base_mac_64_builds.py
+++ b/configs/builds/releng_base_mac_64_builds.py
@@ -38,17 +38,16 @@ config = {
#########################################################################
#########################################################################
###### 64 bit specific ######
'base_name': 'OS X 10.7 %(branch)s',
'platform': 'macosx64',
'stage_platform': 'macosx64',
- 'enable_max_vsize': False,
'use_platform_in_symbols_extra_buildid': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
--- a/configs/builds/releng_base_windows_32_builds.py
+++ b/configs/builds/releng_base_windows_32_builds.py
@@ -60,17 +60,16 @@ config = {
#########################################################################
#########################################################################
###### 32 bit specific ######
'base_name': 'WINNT_5.2_%(branch)s',
'platform': 'win32',
'stage_platform': 'win32',
- 'enable_max_vsize': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/nsis-2.46u;C:/mozilla-build/python27;'
--- a/configs/builds/releng_base_windows_64_builds.py
+++ b/configs/builds/releng_base_windows_64_builds.py
@@ -60,17 +60,16 @@ config = {
#########################################################################
#########################################################################
###### 64 bit specific ######
'base_name': 'WINNT_6.1_x86-64_%(branch)s',
'platform': 'win64',
'stage_platform': 'win64',
- 'enable_max_vsize': False,
'env': {
'MOZ_SYMBOLS_EXTRA_BUILDID': 'win64',
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/python27;C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
--- a/configs/developer_config.py
+++ b/configs/developer_config.py
@@ -19,30 +19,21 @@ config = {
"local_workdir": LOCAL_WORKDIR,
# General local variable overwrite
"exes": {},
"find_links": ["http://pypi.pub.build.mozilla.org/pub"],
"replace_urls": [
("http://pvtbuilds.pvt.build",
"https://pvtbuilds"),
- ("http://tooltool.pvt.build.mozilla.org/build",
- "https://secure.pub.build.mozilla.org/tooltool/pvt/build")
],
# Talos related
"python_webserver": True,
"virtualenv_path": '%s/build/venv' % os.getcwd(),
- # Tooltool related
- "tooltool_servers": [
- "https://secure.pub.build.mozilla.org/tooltool/pvt/build"
- ],
"tooltool_cache": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
"tooltool_cache_path": os.path.join(LOCAL_WORKDIR,
"builds/tooltool_cache"),
# Android related
"host_utils_url":
- "https://secure.pub.build.mozilla.org/tooltool" +
- "/pvt/build/sha512/372c89f9dccaf5ee3b9d35fd1cfeb089e1e5db3ff1c04e35" +
- "aa3adc8800bc61a2ae10e321f37ae7bab20b56e60941f91bb003bcb22035902a73" +
- "d70872e7bd3282",
+ "https://api.pub.build.mozilla.org/tooltool/sha512/372c89f9dccaf5ee3b9d35fd1cfeb089e1e5db3ff1c04e35aa3adc8800bc61a2ae10e321f37ae7bab20b56e60941f91bb003bcb22035902a73d70872e7bd3282",
}
--- a/configs/luciddream/linux_config.py
+++ b/configs/luciddream/linux_config.py
@@ -1,18 +1,18 @@
# This is a template config file for luciddream production.
import os
import platform
HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
else:
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
config = {
# mozharness script options
"xre_url": xre_url,
"b2gdesktop_url": "http://ftp.mozilla.org/pub/mozilla.org/b2g/nightly/2015/03/2015-03-09-00-25-06-mozilla-b2g37_v2_2/b2g-37.0.multi.linux-i686.tar.bz2",
# mozharness configuration
"vcs_share_base": HG_SHARE_BASE_DIR,
@@ -34,11 +34,10 @@ config = {
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
# will handle in-tree config as subsequent patch
# "in_tree_config": "config/mozharness/luciddream.py",
"download_symbols": "ondemand",
"download_minidump_stackwalk": True,
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"tooltool_cache": "/builds/tooltool_cache",
}
--- a/configs/marionette/automation_emulator_config.py
+++ b/configs/marionette/automation_emulator_config.py
@@ -3,17 +3,16 @@ import os
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
# marionette options
"test_type": "b2g",
"emulator": "arm",
"tooltool_cache": "/builds/tooltool_cache",
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"test_manifest": "unit-tests.ini",
"vcs_share_base": HG_SHARE_BASE_DIR,
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
--- a/configs/marionette/gaia_ui_test_prod_config.py
+++ b/configs/marionette/gaia_ui_test_prod_config.py
@@ -1,18 +1,18 @@
# This is a template config file for marionette production.
import os
import platform
HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
else:
- xre_url = "http://tooltool.pvt.build.mozilla.org/build/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
+ xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
config = {
# marionette options
"test_type": "b2g",
"marionette_address": "localhost:2828",
"gaiatest": True,
"xre_url": xre_url,
"application": "b2g",
@@ -44,11 +44,10 @@ config = {
"download_symbols": "ondemand",
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"vcs_output_timeout": 1760,
"in_tree_config": "config/mozharness/marionette.py",
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
"tooltool_cache": "/builds/tooltool_cache",
}
--- a/configs/marionette/prod_config.py
+++ b/configs/marionette/prod_config.py
@@ -34,11 +34,10 @@ config = {
],
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
"in_tree_config": "config/mozharness/marionette.py",
"download_symbols": "ondemand",
"download_minidump_stackwalk": True,
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
"tooltool_cache": "/builds/tooltool_cache",
}
--- a/configs/marionette/windows_config.py
+++ b/configs/marionette/windows_config.py
@@ -36,11 +36,10 @@ config = {
'run-marionette',
],
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
"in_tree_config": "config/mozharness/marionette.py",
"download_minidump_stackwalk": True,
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
"download_symbols": "ondemand",
}
--- a/configs/single_locale/linux.py
+++ b/configs/single_locale/linux.py
@@ -17,17 +17,17 @@ config = {
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-l10n",
"js_src_dir": "js/src",
"make_dirs": ['config'],
"vcs_share_base": "/builds/hg-shared",
# tooltool
- 'tooltool_url': 'http://tooltool.pvt.build.mozilla.org/build/',
+ 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_script': ["/builds/tooltool.py"],
'tooltool_bootstrap': "setup.sh",
'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux32/releng.manifest',
# balrog credential file:
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US"],
--- a/configs/single_locale/linux64.py
+++ b/configs/single_locale/linux64.py
@@ -17,17 +17,17 @@ config = {
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-l10n",
"js_src_dir": "js/src",
"make_dirs": ['config'],
"vcs_share_base": "/builds/hg-shared",
# tooltool
- 'tooltool_url': 'http://tooltool.pvt.build.mozilla.org/build/',
+ 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_script': ["/builds/tooltool.py"],
'tooltool_bootstrap': "setup.sh",
'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/releng.manifest',
# balrog credential file:
'balrog_credentials_file': 'oauth.txt',
# l10n
"ignore_locales": ["en-US"],
--- a/configs/single_locale/macosx64.py
+++ b/configs/single_locale/macosx64.py
@@ -26,17 +26,17 @@ config = {
"make_dirs": ['config'],
"vcs_share_base": "/builds/hg-shared",
"upload_env_extra": {
"MOZ_PKG_PLATFORM": "mac",
},
# tooltool
- 'tooltool_url': 'http://tooltool.pvt.build.mozilla.org/build/',
+ 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_script': ["/builds/tooltool.py"],
'tooltool_bootstrap': "setup.sh",
'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/releng.manifest',
# balrog credential file:
'balrog_credentials_file': 'oauth.txt',
# l10n
--- a/configs/single_locale/mozilla-aurora_android-api-11.py
+++ b/configs/single_locale/mozilla-aurora_android-api-11.py
@@ -26,17 +26,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/mozilla-aurora_android-api-9.py
+++ b/configs/single_locale/mozilla-aurora_android-api-9.py
@@ -26,17 +26,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/mozilla-aurora_android.py
+++ b/configs/single_locale/mozilla-aurora_android.py
@@ -26,17 +26,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/mozilla-central_android-api-11.py
+++ b/configs/single_locale/mozilla-central_android-api-11.py
@@ -26,17 +26,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/mozilla-central_android-api-9.py
+++ b/configs/single_locale/mozilla-central_android-api-9.py
@@ -26,17 +26,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/mozilla-central_android.py
+++ b/configs/single_locale/mozilla-central_android.py
@@ -26,17 +26,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/release_mozilla-beta_android.py
+++ b/configs/single_locale/release_mozilla-beta_android.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/release_mozilla-beta_android_api_11.py
+++ b/configs/single_locale/release_mozilla-beta_android_api_11.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/release_mozilla-beta_android_api_9.py
+++ b/configs/single_locale/release_mozilla-beta_android_api_9.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/release_mozilla-release_android.py
+++ b/configs/single_locale/release_mozilla-release_android.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/release_mozilla-release_android_api_11.py
+++ b/configs/single_locale/release_mozilla-release_android_api_11.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/release_mozilla-release_android_api_9.py
+++ b/configs/single_locale/release_mozilla-release_android_api_9.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/staging_release_mozilla-beta_android.py
+++ b/configs/single_locale/staging_release_mozilla-beta_android.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/staging_release_mozilla-beta_android_api_11.py
+++ b/configs/single_locale/staging_release_mozilla-beta_android_api_11.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/staging_release_mozilla-beta_android_api_9.py
+++ b/configs/single_locale/staging_release_mozilla-beta_android_api_9.py
@@ -27,17 +27,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/staging_release_mozilla-release_android.py
+++ b/configs/single_locale/staging_release_mozilla-release_android.py
@@ -29,17 +29,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/staging_release_mozilla-release_android_api_11.py
+++ b/configs/single_locale/staging_release_mozilla-release_android_api_11.py
@@ -29,17 +29,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/staging_release_mozilla-release_android_api_9.py
+++ b/configs/single_locale/staging_release_mozilla-release_android_api_9.py
@@ -29,17 +29,16 @@ config = {
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
"bootstrap_cmd": ["bash", "-xe", "setup.sh"],
},
"exes": {
'tooltool.py': '/tools/tooltool.py',
},
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-release",
"revision": "default",
"dest": MOZILLA_DIR,
}, {
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"revision": "default",
"dest": "buildbot-configs"
--- a/configs/single_locale/win32.py
+++ b/configs/single_locale/win32.py
@@ -18,17 +18,17 @@ config = {
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-l10n",
"js_src_dir": "js/src",
"make_dirs": ['config'],
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
- 'tooltool_url': 'http://tooltool.pvt.build.mozilla.org/build/',
+ 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_bootstrap': "setup.sh",
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest',
# balrog credential file:
'balrog_credentials_file': 'oauth.txt',
# l10n
--- a/configs/single_locale/win64.py
+++ b/configs/single_locale/win64.py
@@ -18,17 +18,17 @@ config = {
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-l10n",
"js_src_dir": "js/src",
"make_dirs": ['config'],
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
- 'tooltool_url': 'http://tooltool.pvt.build.mozilla.org/build/',
+ 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_bootstrap': "setup.sh",
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/releng.manifest',
# balrog credential file:
'balrog_credentials_file': 'oauth.txt',
# l10n
--- a/configs/unittests/linux_unittest.py
+++ b/configs/unittests/linux_unittest.py
@@ -158,11 +158,10 @@ config = {
"buildbot_max_log_size": 52428800,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"download_minidump_stackwalk": True,
"minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
"minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
"tooltool_cache": "/builds/tooltool_cache",
}
--- a/configs/unittests/mac_unittest.py
+++ b/configs/unittests/mac_unittest.py
@@ -136,11 +136,10 @@ config = {
"buildbot_max_log_size": 52428800,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"download_minidump_stackwalk": True,
"minidump_stackwalk_path": "macosx64-minidump_stackwalk",
"minidump_tooltool_manifest_path": "config/tooltool-manifests/macosx64/releng.manifest",
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
"tooltool_cache": "/builds/tooltool_cache",
}
--- a/configs/unittests/win_unittest.py
+++ b/configs/unittests/win_unittest.py
@@ -152,10 +152,9 @@ config = {
"buildbot_max_log_size": 52428800,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"download_minidump_stackwalk": True,
"minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
"minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
}
--- a/configs/users/sfink/spidermonkey.py
+++ b/configs/users/sfink/spidermonkey.py
@@ -22,17 +22,16 @@ config = {
"dest": BRANCH,
}, {
"repo": "https://hg.mozilla.org/build/tools",
"revision": "default",
"dest": "tools"
}],
"tools_dir": "/tools",
- "tooltool_servers": [ "http://localhost/tooltool" ],
"mock_target": "mozilla-centos6-x86_64",
"upload_remote_basepath": "/tmp/upload-base",
"upload_ssh_server": "localhost",
"upload_ssh_key": "/home/sfink/.ssh/id_rsa",
"upload_ssh_user": "sfink",
"upload_label": "linux64-br-haz",
--- a/configs/vcs_sync/beagle.py
+++ b/configs/vcs_sync/beagle.py
@@ -39,17 +39,16 @@ config = {
"branch_config": {
"branches": {
"default": "master",
},
},
},
"backup_dir": "/mnt/netapp/github_sync/aki/%s" % hostname,
"cvs_manifest": CVS_MANIFEST,
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"cvs_history_tarball": "/home/pmoore/mozilla-cvs-history.tar.bz2",
"env": {
"PATH": "%(PATH)s:/usr/libexec/git-core",
},
"conversion_repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-b2g18",
"revision": "default",
"repo_name": "mozilla-b2g18",
--- a/configs/vcs_sync/gecko-git.py
+++ b/configs/vcs_sync/gecko-git.py
@@ -37,17 +37,16 @@ config = {
"branch_config": {
"branches": {
"default": "master",
},
},
},
"backup_dir": "/mnt/netapp/github_sync/aki/%s" % hostname,
"cvs_manifest": CVS_MANIFEST,
- "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
"cvs_history_tarball": "/home/pmoore/mozilla-cvs-history.tar.bz2",
"env": {
"PATH": "%(PATH)s:/usr/libexec/git-core",
},
"conversion_repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-b2g37_v2_2",
"revision": "default",
"repo_name": "mozilla-b2g37_v2_2",
--- a/configs/web_platform_tests/prod_config.py
+++ b/configs/web_platform_tests/prod_config.py
@@ -29,14 +29,12 @@ config = {
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
"download_minidump_stackwalk": True,
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
-
"tooltool_cache": "/builds/tooltool_cache",
}
--- a/configs/web_platform_tests/prod_config_windows.py
+++ b/configs/web_platform_tests/prod_config_windows.py
@@ -35,11 +35,9 @@ config = {
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
"download_minidump_stackwalk": True,
-
- "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
}
--- a/mozharness/mozilla/building/buildb2gbase.py
+++ b/mozharness/mozilla/building/buildb2gbase.py
@@ -96,17 +96,16 @@ class B2GBuildBaseScript(BuildbotMixin,
config_options=[],
require_config_file=False,
config={},
all_actions=[],
default_actions=[]):
default_config = {
'vcs_share_base': os.environ.get('HG_SHARE_BASE_DIR'),
'buildbot_json_path': os.environ.get('PROPERTIES_FILE'),
- 'tooltool_servers': None,
'tools_repo': 'https://hg.mozilla.org/build/tools',
'repo_repo': "https://git.mozilla.org/external/google/gerrit/git-repo.git",
'repo_rev': 'stable',
'hgurl': 'https://hg.mozilla.org/',
}
default_config.update(config)
config_options = config_options + self.default_config_options
--- a/mozharness/mozilla/building/buildbase.py
+++ b/mozharness/mozilla/building/buildbase.py
@@ -1006,17 +1006,28 @@ or run without that action (ie: --no-{ac
next(mozconfig)
for line in mozconfig:
self.info(line)
else:
self.fatal("To build, you must supply a mozconfig from inside the "
"tree to use use. Please provide the path in your "
"config via 'src_mozconfig'")
- # TODO add this or merge to ToolToolMixin
+ # TODO: replace with ToolToolMixin
+ def _get_tooltool_auth_file(self):
+ # set the default authentication file based on platform; this
+ # corresponds to where puppet puts the token
+ if 'tooltool_authentication_file' in self.config:
+ return self.config['tooltool_authentication_file']
+
+ if self._is_windows():
+ return r'c:\builds\relengapi.tok'
+ else:
+ return '/builds/relengapi.tok'
+
def _run_tooltool(self):
self._assert_cfg_valid_for_action(
['tooltool_script', 'tooltool_bootstrap', 'tooltool_url'],
'build'
)
c = self.config
dirs = self.query_abs_dirs()
if not c.get('tooltool_manifest_src'):
@@ -1028,16 +1039,17 @@ or run without that action (ie: --no-{ac
cmd = [
'sh',
fetch_script_path,
tooltool_manifest_path,
c['tooltool_url'],
c['tooltool_bootstrap'],
]
cmd.extend(c['tooltool_script'])
+ cmd.extend(['--authentication-file', self._get_tooltool_auth_file()])
self.info(str(cmd))
self.run_command(cmd, cwd=dirs['abs_src_dir'], halt_on_failure=True)
def query_revision(self, source_path=None):
""" returns the revision of the build
first will look for it in buildbot_properties and then in
buildbot_config. Failing that, it will actually poll the source of
@@ -1116,30 +1128,16 @@ or run without that action (ie: --no-{ac
testresults = [('num_ctors', 'num_ctors', num_ctors, str(num_ctors))]
self.set_buildbot_property('num_ctors',
num_ctors,
write_to_file=True)
self.set_buildbot_property('testresults',
testresults,
write_to_file=True)
- def _count_vsize(self):
- """gets linker vsize and sets it to testresults."""
- dirs = self.query_abs_dirs()
- vsize_path = os.path.join(
- dirs['abs_obj_dir'], 'toolkit', 'library', 'linker-vsize'
- )
- cmd = ['cat', vsize_path]
- vsize = self.get_output_from_command(cmd, cwd=dirs['abs_src_dir'])
- testresults = [('libxul_link', 'libxul_link', int(vsize), str(vsize))]
- self.set_buildbot_property('vsize', vsize, write_to_file=True)
- self.set_buildbot_property('testresults',
- testresults,
- write_to_file=True)
-
def _graph_server_post(self):
"""graph server post results."""
self._assert_cfg_valid_for_action(
['base_name', 'graph_server', 'graph_selector'],
'generate-build-stats'
)
c = self.config
dirs = self.query_abs_dirs()
@@ -1618,47 +1616,39 @@ or run without that action (ie: --no-{ac
AUTOMATION_EXIT_CODES[::-1]
)
self.error("'make -k check' did not run successfully. Please check "
"log for errors.")
def generate_build_stats(self):
"""grab build stats following a compile.
- This action handles all statitics from a build: 'count_ctors' and
- 'vsize' and then posts to graph server the results.
+ This action handles all statistics from a build: 'count_ctors'
+ and then posts to graph server the results.
We only post to graph server for non nightly build
"""
c = self.config
# grab any props available from this or previous unclobbered runs
self.generate_build_props(console_output=False,
halt_on_failure=False)
- # enable_max_vsize will be True for builds like pgo win32 builds
- # but not for nightlies (nightlies are pgo builds too so the
- # check is needed).
- enable_max_vsize = c.get('enable_max_vsize') and c.get('pgo_build')
-
- if enable_max_vsize or c.get('enable_count_ctors'):
+ if c.get('enable_count_ctors'):
if c.get('enable_count_ctors'):
self.info("counting ctors...")
self._count_ctors()
num_ctors = self.buildbot_properties.get('num_ctors', 'unknown')
self.info("TinderboxPrint: num_ctors: %s" % (num_ctors,))
- if enable_max_vsize:
- self.info("getting vsize...")
- self._count_vsize()
if not self.query_is_nightly():
self._graph_server_post()
else:
self.info("We are not posting to graph server as this is a "
"nightly build.")
else:
- self.info("Nothing to do for this action since ctors and vsize "
+ self.info("Nothing to do for this action since ctors "
"counts are disabled for this build.")
def _do_sendchange(self, test_type):
c = self.config
# grab any props available from this or previous unclobbered runs
self.generate_build_props(console_output=False,
halt_on_failure=False)
--- a/mozharness/mozilla/proxxy.py
+++ b/mozharness/mozilla/proxxy.py
@@ -26,18 +26,16 @@ class Proxxy(ScriptMixin, LogMixin):
# Default configuration. Can be overridden via self.config
PROXXY_CONFIG = {
"urls": [
('http://ftp.mozilla.org', 'ftp.mozilla.org'),
('https://ftp.mozilla.org', 'ftp.mozilla.org'),
('https://ftp-ssl.mozilla.org', 'ftp.mozilla.org'),
('http://pvtbuilds.pvt.build.mozilla.org', 'pvtbuilds.mozilla.org'),
- # tooltool
- ('http://tooltool.pvt.build.mozilla.org', 'tooltool.pvt.build.mozilla.org'),
# pypi
('http://pypi.pvt.build.mozilla.org', 'pypi.pvt.build.mozilla.org'),
('http://pypi.pub.build.mozilla.org', 'pypi.pub.build.mozilla.org'),
# taskcluster stuff
('https://queue.taskcluster.net', 'queue.taskcluster.net'),
],
"instances": [
'proxxy1.srv.releng.use1.mozilla.com',
--- a/mozharness/mozilla/testing/testbase.py
+++ b/mozharness/mozilla/testing/testbase.py
@@ -672,17 +672,17 @@ Did you run with --create-virtualenv? Is
self.tooltool_fetch(
manifest=os.path.join(dirs.get('abs_test_install_dir',
os.path.join(dirs['abs_work_dir'], 'tests')),
tooltool_manifest_path),
output_dir=dirs['abs_work_dir'],
cache=c.get('tooltool_cache')
)
except KeyError:
- self.error('missing a required key. is "tooltool_servers" in self.config?')
+ self.error('missing a required key.')
abs_minidump_path = os.path.join(dirs['abs_work_dir'],
minidump_stackwalk_path)
if os.path.exists(abs_minidump_path):
self.chmod(abs_minidump_path, 0755)
self.minidump_stackwalk_path = abs_minidump_path
else:
self.warning("minidump stackwalk path was given but couldn't be found. "
--- a/mozharness/mozilla/tooltool.py
+++ b/mozharness/mozilla/tooltool.py
@@ -1,56 +1,84 @@
"""module for tooltool operations"""
import os
+import sys
from mozharness.base.errors import PythonErrorList
from mozharness.base.log import ERROR, FATAL
from mozharness.mozilla.proxxy import Proxxy
from mozharness.lib.python.authentication import get_credentials_path
TooltoolErrorList = PythonErrorList + [{
'substr': 'ERROR - ', 'level': ERROR
}]
TOOLTOOL_PY_URL = \
"https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py"
+TOOLTOOL_SERVERS = [
+ 'https://api.pub.build.mozilla.org/tooltool/',
+]
+
class TooltoolMixin(object):
"""Mixin class for handling tooltool manifests.
- Requires self.config['tooltool_servers'] to be a list of base urls
+ To use a tooltool server other than the Mozilla server, override
+ config['tooltool_servers']. To specify a different authentication
+ file than that used in releng automation,override
+ config['tooltool_authentication_file']; set it to None to not pass
+ any authentication information (OK for public files)
"""
+ def _get_auth_file(self):
+ # set the default authentication file based on platform; this
+ # corresponds to where puppet puts the token
+ if 'tooltool_authentication_file' in self.config:
+ return self.config['tooltool_authentication_file']
+
+ if self._is_windows():
+ return r'c:\builds\relengapi.tok'
+ else:
+ return '/builds/relengapi.tok'
+
def tooltool_fetch(self, manifest, bootstrap_cmd=None,
output_dir=None, privileged=False, cache=None):
"""docstring for tooltool_fetch"""
tooltool = self.query_exe('tooltool.py', return_type='list')
if self.config.get("developer_mode"):
if not os.path.exists(str(tooltool)):
tooltool = self._fetch_tooltool_py()
cmd = [tooltool,
"--authentication-file",
get_credentials_path()]
else:
cmd = tooltool
- # get the tooltools servers from configuration
- default_urls = self.config['tooltool_servers']
+ # get the tooltool servers from configuration
+ default_urls = self.config.get('tooltool_servers', TOOLTOOL_SERVERS)
+
# add slashes (bug 1155630)
def add_slash(url):
return url if url.endswith('/') else (url + '/')
default_urls = [add_slash(u) for u in default_urls]
+
+ # proxxy-ify
proxxy = Proxxy(self.config, self.log_obj)
proxxy_urls = proxxy.get_proxies_and_urls(default_urls)
for proxyied_url in proxxy_urls:
cmd.extend(['--url', proxyied_url])
+ # handle authentication file, if given
+ auth_file = self._get_auth_file()
+ if auth_file:
+ cmd.extend(['--authentication-file', auth_file])
+
cmd.extend(['fetch', '-m', manifest, '-o'])
if cache:
cmd.extend(['-c', cache])
self.retry(
self.run_command,
args=(cmd, ),
--- a/scripts/b2g_emulator_unittest.py
+++ b/scripts/b2g_emulator_unittest.py
@@ -332,28 +332,20 @@ class B2GEmulatorTest(TestingMixin, VCSM
def install(self):
# The emulator was extracted during the download_and_extract step;
# there's no separate binary to install. We call pass to prevent
# the base implementation from running here.
pass
def _get_success_codes(self, suite_name):
- chunk = int(self.config.get('this_chunk', 0))
- branch = self.buildbot_config['properties'].get('branch')
- platform = self.buildbot_config['properties'].get('stage_platform')
-
success_codes = None
if suite_name == 'xpcshell':
# bug 773703
success_codes = [0, 1]
- elif suite_name == 'mochitest' and platform == 'emulator':
- if chunk == 11 or (chunk == 12 and branch in ('mozilla-b2g32_v2_0', 'mozilla-b2g34_v2_1')):
- # bug 1120580
- success_codes = [0, 247]
return success_codes
def run_tests(self):
"""
Run the tests
"""
dirs = self.query_abs_dirs()
--- a/scripts/desktop_l10n.py
+++ b/scripts/desktop_l10n.py
@@ -1244,16 +1244,28 @@ class DesktopSingleLocale(LocalesMixin,
"""returns a list of .pcf files in basedir"""
pgc_files = []
for dirpath, dirnames, filenames in os.walk(basedir):
for pgc in filenames:
if pgc.endswith('.pgc'):
pgc_files.append(os.path.join(dirpath, pgc))
return pgc_files
+ # TODO: replace with ToolToolMixin
+ def _get_tooltool_auth_file(self):
+ # set the default authentication file based on platform; this
+ # corresponds to where puppet puts the token
+ if 'tooltool_authentication_file' in self.config:
+ return self.config['tooltool_authentication_file']
+
+ if self._is_windows():
+ return r'c:\builds\relengapi.tok'
+ else:
+ return '/builds/relengapi.tok'
+
def _run_tooltool(self):
config = self.config
dirs = self.query_abs_dirs()
if not config.get('tooltool_manifest_src'):
return self.warning(ERROR_MSGS['tooltool_manifest_undetermined'])
fetch_script_path = os.path.join(dirs['abs_tools_dir'],
'scripts/tooltool/tooltool_wrapper.sh')
tooltool_manifest_path = os.path.join(dirs['abs_mozilla_dir'],
@@ -1261,16 +1273,17 @@ class DesktopSingleLocale(LocalesMixin,
cmd = [
'sh',
fetch_script_path,
tooltool_manifest_path,
config['tooltool_url'],
config['tooltool_bootstrap'],
]
cmd.extend(config['tooltool_script'])
+ cmd.extend(['--authentication-file', self._get_tooltool_auth_file()])
self.info(str(cmd))
self.run_command(cmd, cwd=dirs['abs_mozilla_dir'], halt_on_failure=True)
def _create_base_dirs(self):
config = self.config
dirs = self.query_abs_dirs()
for make_dir in config.get('make_dirs', []):
dirname = os.path.join(dirs['abs_objdir'], make_dir)
--- a/scripts/fx_desktop_build.py
+++ b/scripts/fx_desktop_build.py
@@ -47,18 +47,17 @@ class FxDesktopBuild(BuildScript, object
"nightly_build": False,
'balrog_credentials_file': 'oauth.txt',
'taskcluster_credentials_file': 'oauth.txt',
'periodic_clobber': 168,
# hg tool stuff
'default_vcs': 'hgtool',
"tools_repo": "https://hg.mozilla.org/build/tools",
"repo_base": "https://hg.mozilla.org",
- 'tooltool_url': 'http://tooltool.pvt.build.mozilla'
- '.org/build',
+ 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
"graph_selector": "/server/collect.cgi",
# only used for make uploadsymbols
'old_packages': [
"%(objdir)s/dist/firefox-*",
"%(objdir)s/dist/fennec*",
"%(objdir)s/dist/seamonkey*",
"%(objdir)s/dist/thunderbird*",
"%(objdir)s/dist/install/sea/*.exe"
--- a/scripts/hazard_build.py
+++ b/scripts/hazard_build.py
@@ -88,22 +88,16 @@ class B2GHazardBuild(PurgeMixin, B2GBuil
self.buildid = None
self.analysis = HazardAnalysis()
def _pre_config_lock(self, rw_config):
super(B2GHazardBuild, self)._pre_config_lock(rw_config)
if self.buildbot_config:
- bb_props = [('tooltool_url_list', 'tooltool_servers', ['http://tooltool.pvt.build.mozilla.org/build']),
- ]
- buildbot_props = self.buildbot_config.get('properties', {})
- for bb_prop, cfg_prop, default in bb_props:
- if not self.config.get(cfg_prop) and buildbot_props.get(bb_prop, default):
- self.config[cfg_prop] = buildbot_props.get(bb_prop, default)
self.config['is_automation'] = True
else:
self.config['is_automation'] = False
dirs = self.query_abs_dirs()
replacements = self.config['env_replacements'].copy()
for k, v in replacements.items():
replacements[k] = v % dirs
--- a/scripts/spidermonkey_build.py
+++ b/scripts/spidermonkey_build.py
@@ -114,17 +114,16 @@ class SpidermonkeyBuild(MockMixin,
'upload-analysis',
'check-expectations',
],
config={
'default_vcs': 'hgtool',
'vcs_share_base': os.environ.get('HG_SHARE_BASE_DIR'),
'ccache': True,
'buildbot_json_path': os.environ.get('PROPERTIES_FILE'),
- 'tooltool_servers': None,
'tools_repo': 'https://hg.mozilla.org/build/tools',
'upload_ssh_server': None,
'upload_remote_basepath': None,
'enable_try_uploads': True,
},
)
@@ -143,17 +142,16 @@ class SpidermonkeyBuild(MockMixin,
('base_bundle_urls', 'hgtool_base_bundle_urls', None),
('base_mirror_urls', 'hgtool_base_mirror_urls', None),
('hgurl', 'hgurl', None),
('clobberer_url', 'clobberer_url', 'https://api.pub.build.mozilla.org/clobberer/lastclobber'),
('purge_minsize', 'purge_minsize', 15),
('purge_maxage', 'purge_maxage', None),
('purge_skip', 'purge_skip', None),
('force_clobber', 'force_clobber', None),
- ('tooltool_url_list', 'tooltool_servers', ['http://tooltool.pvt.build.mozilla.org/build']),
]
buildbot_props = self.buildbot_config.get('properties', {})
for bb_prop, cfg_prop, default in bb_props:
if not self.config.get(cfg_prop) and buildbot_props.get(bb_prop, default):
self.config[cfg_prop] = buildbot_props.get(bb_prop, default)
self.config['is_automation'] = True
else:
self.config['is_automation'] = False
@@ -371,17 +369,16 @@ class SpidermonkeyBuild(MockMixin,
def checkout_source(self):
try:
self.do_checkout_source()
except Exception as e:
self.fatal("checkout failed: " + str(e), exit_code=RETRY)
def get_blobs(self):
dirs = self.query_abs_dirs()
- assert self.config['tooltool_servers']
self.tooltool_fetch(self.query_compiler_manifest(), "sh " + self.config['compiler_setup'],
dirs['abs_work_dir'])
self.tooltool_fetch(self.query_sixgill_manifest(), "sh " + self.config['sixgill_setup'],
dirs['abs_work_dir'])
def clobber_shell(self):
self.analysis.clobber_shell(self)
