--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -548,16 +548,17 @@ PLATFORM_VARS = {
},
'macosx64-mulet': {
'product_name': 'firefox',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_mac_64_builds.py',
'--custom-build-variant-cfg', 'mulet',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'multi_locale': False,
'unittest_platform': 'macosx64-mulet-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
@@ -815,16 +816,17 @@ PLATFORM_VARS = {
'win32-mulet': {
'product_name': 'firefox',
'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_windows_32_builds.py',
'--custom-build-variant-cfg', 'mulet',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'app_name': 'browser',
'base_name': 'Win32 Mulet %(branch)s',
'mozconfig': 'in_tree',
'src_mozconfig': 'b2g/dev/config/mozconfigs/win32/mulet',
@@ -1566,16 +1568,17 @@ PLATFORM_VARS = {
],
"mozharness_repo_cache": "/tools/checkouts/mozharness",
"tools_repo_cache": "/tools/checkouts/build-tools",
"mozharness_desktop_build": {
"script_name": "scripts/fx_desktop_build.py",
"extra_args": [
"--config", "builds/releng_base_linux_64_builds.py",
"--custom-build-variant-cfg", "graphene"
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
"script_timeout": 3 * 3600,
"script_maxtime": int(5.5 * 3600),
},
"stage_product": "b2g",
"base_name": "graphene_%(branch)s_linux64",
"platform_objdir": OBJDIR,
"slaves": SLAVES["mock"],
@@ -1585,16 +1588,17 @@ PLATFORM_VARS = {
"mozharness_python": "/tools/buildbot/bin/python",
"reboot_command": ["scripts/external_tools/count_and_reboot.py",
"-f", "../reboot_count.txt", "-n", "1", "-z"],
"mozharness_desktop_build": {
"script_name": "scripts/fx_desktop_build.py",
"extra_args": [
"--config", "builds/releng_base_mac_64_builds.py",
"--custom-build-variant-cfg", "graphene"
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
"script_timeout": 3 * 3600,
"script_maxtime": int(5.5 * 3600),
},
"stage_product": "b2g",
"base_name": "graphene_%(branch)s_macosx64",
"platform_objdir": OBJDIR,
"slaves": SLAVES["macosx64-lion"],
@@ -1607,16 +1611,17 @@ PLATFORM_VARS = {
"scripts/external_tools/count_and_reboot.py",
"-f", "../reboot_count.txt","-n", "1", "-z"
],
"mozharness_desktop_build": {
"script_name": "scripts/fx_desktop_build.py",
"extra_args": [
"--config", "builds/releng_base_windows_64_builds.py",
"--custom-build-variant-cfg", "graphene"
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
"script_timeout": 3 * 3600,
"script_maxtime": int(5.5 * 3600),
},
"stage_product": "b2g",
"base_name": "graphene_%(branch)s_win64",
"platform_objdir": OBJDIR,
"slaves": SLAVES["win64-rev2"],
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -148,16 +148,17 @@ PLATFORM_VARS = {
'-f', '../reboot_count.txt', '-n', '1', '-z'
],
'mozharness_repo_cache': '/tools/checkouts/mozharness',
'tools_repo_cache': '/tools/checkouts/build-tools',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_32_builds.py',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'mozharness_desktop_l10n': {
'capable': True,
'scriptName': 'scripts/desktop_l10n.py',
'l10n_chunks': 3,
@@ -268,16 +269,17 @@ PLATFORM_VARS = {
'-f', '../reboot_count.txt', '-n', '1', '-z'
],
'mozharness_repo_cache': '/tools/checkouts/mozharness',
'tools_repo_cache': '/tools/checkouts/build-tools',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_64_builds.py',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'mozharness_desktop_l10n': {
'capable': True,
'scriptName': 'scripts/desktop_l10n.py',
'l10n_chunks': 3,
@@ -370,16 +372,17 @@ PLATFORM_VARS = {
],
'mozharness_repo_cache': '/tools/checkouts/mozharness',
'tools_repo_cache': '/tools/checkouts/build-tools',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_64_builds.py',
'--custom-build-variant-cfg', 'asan',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'product_name': 'firefox',
'unittest_platform': 'linux64-asan-opt',
'app_name': 'browser',
@@ -467,16 +470,17 @@ PLATFORM_VARS = {
],
'mozharness_repo_cache': '/tools/checkouts/mozharness',
'tools_repo_cache': '/tools/checkouts/build-tools',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_64_builds.py',
'--custom-build-variant-cfg', 'asan-and-debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'enable_nightly': True,
'product_name': 'firefox',
'unittest_platform': 'linux64-asan-debug',
@@ -565,16 +569,17 @@ PLATFORM_VARS = {
],
'mozharness_repo_cache': '/tools/checkouts/mozharness',
'tools_repo_cache': '/tools/checkouts/build-tools',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_64_builds.py',
'--custom-build-variant-cfg', 'stat-and-debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'enable_nightly': False,
'product_name': 'firefox',
'unittest_platform': 'linux64-st-an-debug',
@@ -712,16 +717,17 @@ PLATFORM_VARS = {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': ['scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_64_builds.py',
'--custom-build-variant-cfg', 'code-coverage',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'consider_for_nightly': False,
'enable_nightly': False,
'enable_xulrunner': False,
'enable_opt_unittests': True,
@@ -800,16 +806,17 @@ PLATFORM_VARS = {
'macosx64': {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': ['scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_mac_64_builds.py',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'mozharness_desktop_l10n': {
'capable': True,
'scriptName': 'scripts/desktop_l10n.py',
'l10n_chunks': 3,
@@ -876,16 +883,17 @@ PLATFORM_VARS = {
'c:/mozilla-build/python27/python', '-u',
'scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt','-n', '1', '-z'
],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_windows_32_builds.py',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'mozharness_desktop_l10n': {
'capable': True,
'scriptName': 'scripts/desktop_l10n.py',
'l10n_chunks': 3,
@@ -945,16 +953,17 @@ PLATFORM_VARS = {
'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
},
'win64': {
'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_windows_64_builds.py',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'mozharness_desktop_l10n': {
'capable': True,
'scriptName': 'scripts/desktop_l10n.py',
'l10n_chunks': 3,
@@ -1028,16 +1037,17 @@ PLATFORM_VARS = {
],
'mozharness_repo_cache': '/tools/checkouts/mozharness',
'tools_repo_cache': '/tools/checkouts/build-tools',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_32_builds.py',
'--custom-build-variant-cfg', 'debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'enable_nightly': False,
'enable_xulrunner': False,
'product_name': 'firefox',
@@ -1132,16 +1142,17 @@ PLATFORM_VARS = {
],
'mozharness_repo_cache': '/tools/checkouts/mozharness',
'tools_repo_cache': '/tools/checkouts/build-tools',
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_linux_64_builds.py',
'--custom-build-variant-cfg', 'debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'enable_nightly': False,
'enable_xulrunner': False,
'product_name': 'firefox',
@@ -1211,16 +1222,17 @@ PLATFORM_VARS = {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': ['scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_mac_64_builds.py',
'--custom-build-variant-cfg', 'debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'enable_nightly': False,
'enable_xulrunner': False,
'product_name': 'firefox',
@@ -1268,16 +1280,17 @@ PLATFORM_VARS = {
'mozharness_python': '/tools/buildbot/bin/python',
'reboot_command': ['scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt', '-n', '1', '-z'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_mac_64_builds.py',
'--custom-build-variant-cfg', 'stat-and-debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'enable_nightly': False,
'enable_xulrunner': False,
'product_name': 'firefox',
@@ -1321,16 +1334,17 @@ PLATFORM_VARS = {
'scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt','-n', '1', '-z'
],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_windows_32_builds.py',
'--custom-build-variant-cfg', 'debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'enable_nightly': False,
'enable_xulrunner': False,
'product_name': 'firefox',
@@ -1367,16 +1381,17 @@ PLATFORM_VARS = {
},
'win64-debug': {
'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
'mozharness_desktop_build': {
'script_name': 'scripts/fx_desktop_build.py',
'extra_args': [
'--config', 'builds/releng_base_windows_64_builds.py',
'--custom-build-variant-cfg', 'debug',
+ '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
],
'script_timeout': 3 * 3600,
'script_maxtime': int(5.5 * 3600),
},
'reboot_command': [
'c:/mozilla-build/python27/python', '-u',
'scripts/external_tools/count_and_reboot.py',
'-f', '../reboot_count.txt','-n', '1', '-z'