--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1445,16 +1445,25 @@ PLATFORM_VARS = {
'talos_masters': None,
'nightly_signing_servers': 'dep-signing',
'dep_signing_servers': 'dep-signing',
'consider_for_nightly': False,
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/releng.manifest',
'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
},
'android': {
+ 'mozharness_python': '/tools/buildbot/bin/python',
+ 'mozharness_desktop_build': {
+ 'script_name': 'scripts/fx_desktop_build.py',
+ 'extra_args': [
+ '--config', 'builds/releng_base_android_64_builds.py',
+ ],
+ 'script_timeout': 3 * 3600,
+ 'script_maxtime': int(5.5 * 3600),
+ },
'product_name': 'firefox',
'unittest_platform': 'android-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android 2.3 %(branch)s',
'mozconfig': 'android/%(branch)s/nightly',
'src_mozconfig': 'mobile/android/config/mozconfigs/android/nightly',
'mobile_dir': 'mobile/android',
@@ -1518,16 +1527,26 @@ PLATFORM_VARS = {
'is_mobile_l10n': True,
'l10n_chunks': 5,
'multi_locale': True,
'multi_locale_script': 'scripts/multil10n.py',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'updates_enabled': False,
},
'android-api-9': {
+ 'mozharness_python': '/tools/buildbot/bin/python',
+ 'mozharness_desktop_build': {
+ 'script_name': 'scripts/fx_desktop_build.py',
+ 'extra_args': [
+ '--config', 'builds/releng_base_android_64_builds.py',
+ '--custom-build-variant-cfg', 'api-9',
+ ],
+ 'script_timeout': 3 * 3600,
+ 'script_maxtime': int(5.5 * 3600),
+ },
'product_name': 'firefox',
'unittest_platform': 'android-api-9-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 9 %(branch)s',
'mozconfig': 'in_tree',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly',
'mobile_dir': 'mobile/android',
@@ -1592,16 +1611,26 @@ PLATFORM_VARS = {
'multi_locale': True,
'multi_locale_config_platform': 'android',
'multi_locale_script': 'scripts/multil10n.py',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'update_platform': 'Android_arm-eabi-gcc3',
'updates_enabled': False,
},
'android-api-11': {
+ 'mozharness_python': '/tools/buildbot/bin/python',
+ 'mozharness_desktop_build': {
+ 'script_name': 'scripts/fx_desktop_build.py',
+ 'extra_args': [
+ '--config', 'builds/releng_base_android_64_builds.py',
+ '--custom-build-variant-cfg', 'api-11',
+ ],
+ 'script_timeout': 3 * 3600,
+ 'script_maxtime': int(5.5 * 3600),
+ },
'product_name': 'firefox',
'unittest_platform': 'android-api-11-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 11+ %(branch)s',
'mozconfig': 'in_tree',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-11/nightly',
'mobile_dir': 'mobile/android',
@@ -1666,16 +1695,26 @@ PLATFORM_VARS = {
'multi_locale': True,
'multi_locale_script': 'scripts/multil10n.py',
'multi_locale_config_platform': 'android',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'update_platform': 'Android_arm-eabi-gcc3',
'updates_enabled': False,
},
'android-x86': {
+ 'mozharness_python': '/tools/buildbot/bin/python',
+ 'mozharness_desktop_build': {
+ 'script_name': 'scripts/fx_desktop_build.py',
+ 'extra_args': [
+ '--config', 'builds/releng_base_android_64_builds.py',
+ '--custom-build-variant-cfg', 'x86',
+ ],
+ 'script_timeout': 3 * 3600,
+ 'script_maxtime': int(5.5 * 3600),
+ },
'product_name': 'firefox',
'unittest_platform': 'android-x86-opt',
'app_name': 'browser',
'base_name': 'Android 4.2 x86 %(branch)s',
'mozconfig': 'android-x86/%(branch)s/nightly',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly',
'mobile_dir': 'mobile/android',
'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
@@ -1733,16 +1772,26 @@ PLATFORM_VARS = {
'post_upload_include_platform': True,
'is_mobile_l10n': False,
'multi_locale': True,
'multi_locale_script': 'scripts/multil10n.py',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
'updates_enabled': False,
},
'android-debug': {
+ 'mozharness_python': '/tools/buildbot/bin/python',
+ 'mozharness_desktop_build': {
+ 'script_name': 'scripts/fx_desktop_build.py',
+ 'extra_args': [
+ '--config', 'builds/releng_base_android_64_builds.py',
+ '--custom-build-variant-cfg', 'debug',
+ ],
+ 'script_timeout': 3 * 3600,
+ 'script_maxtime': int(5.5 * 3600),
+ },
'enable_nightly': False,
'product_name': 'firefox',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android 2.3 Debug %(branch)s',
'mozconfig': 'android-debug/%(branch)s/nightly',
'src_mozconfig': 'mobile/android/config/mozconfigs/android/debug',
'mobile_dir': 'mobile/android',
@@ -1802,16 +1851,26 @@ PLATFORM_VARS = {
'unittest_masters': GLOBAL_VARS['unittest_masters'],
'stage_platform': "android-debug",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'updates_enabled': False,
},
'android-api-9-debug': {
+ 'mozharness_python': '/tools/buildbot/bin/python',
+ 'mozharness_desktop_build': {
+ 'script_name': 'scripts/fx_desktop_build.py',
+ 'extra_args': [
+ '--config', 'builds/releng_base_android_64_builds.py',
+ '--custom-build-variant-cfg', 'api-9-debug',
+ ],
+ 'script_timeout': 3 * 3600,
+ 'script_maxtime': int(5.5 * 3600),
+ },
'enable_nightly': False,
'product_name': 'firefox',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 9 %(branch)s debug',
'mozconfig': 'in_tree',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/debug',
'mobile_dir': 'mobile/android',
@@ -1870,16 +1929,26 @@ PLATFORM_VARS = {
'unittest_masters': GLOBAL_VARS['unittest_masters'],
'stage_platform': "android-api-9-debug",
'stage_product': 'mobile',
'post_upload_include_platform': True,
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'updates_enabled': False,
},
'android-api-11-debug': {
+ 'mozharness_python': '/tools/buildbot/bin/python',
+ 'mozharness_desktop_build': {
+ 'script_name': 'scripts/fx_desktop_build.py',
+ 'extra_args': [
+ '--config', 'builds/releng_base_android_64_builds.py',
+ '--custom-build-variant-cfg', 'api-11-debug',
+ ],
+ 'script_timeout': 3 * 3600,
+ 'script_maxtime': int(5.5 * 3600),
+ },
'enable_nightly': False,
'product_name': 'firefox',
'unittest_platform': 'android-api-11-debug',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android armv7 API 11+ %(branch)s debug',
'mozconfig': 'in_tree',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-11/debug',
@@ -2981,16 +3050,22 @@ for b in ('b2g-inbound',):
# END B2G's INBOUND
# enable mozharness desktop builds across m-c and related branches
for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
# if true, any platform with mozharness_desktop_build in its config
# will use mozharness instead of MozillaBuildFactory
branch['desktop_mozharness_builds_enabled'] = True
+# mozharness builds aren't available for android until version 40
+for name, branch in items_before(BRANCHES, 'gecko_version', 40):
+ for platform in branch['platforms'].keys():
+ if 'android' in platform:
+ branch['desktop_mozharness_builds_enabled'] = False
+
# disable win64 for gecko < 36
for name, branch in items_before(BRANCHES, 'gecko_version', 36):
for p in ('win64', 'win64-debug'):
if p in branch['platforms']:
del branch['platforms'][p]
if __name__ == "__main__":
import sys