Bug 1384482 - Add android-api-16 config r=mtabara draft
authorJohan Lorenzo <jlorenzo@mozilla.com>
Fri, 25 Aug 2017 17:20:12 +0200
changeset 15402 5da13c67ec9bc69476000837b1dbd1b3f87030be
parent 15400 1e763539862463f6f8b090599456a602b3ddedf5
push id188
push userbmo:jlorenzo@mozilla.com
push dateFri, 25 Aug 2017 15:24:18 +0000
reviewersmtabara
bugs1384482
Bug 1384482 - Add android-api-16 config r=mtabara MozReview-Commit-ID: A9igiggeXbI
mozilla/config.py
mozilla/project_branches.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1470,16 +1470,17 @@ PLATFORM_VARS = {
             'enable_checktests': True,
             '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'],
         },
+        # TODO Delete android-api-15 once Fennec 56 reaches release
         'android-api-15': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'tools_repo_cache': '/tools/checkouts/build-tools',
             '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-15',
@@ -1555,16 +1556,101 @@ 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',
             'tooltool_script': ['/builds/tooltool.py'],
             'update_platform': 'Android_arm-eabi-gcc3',
             'updates_enabled': False,
         },
+        'android-api-16': {
+            'mozharness_python': '/tools/buildbot/bin/python',
+            'tools_repo_cache': '/tools/checkouts/build-tools',
+            '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-16',
+                    '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
+                ],
+                'script_timeout': 3 * 3600,
+                'script_maxtime': int(5.5 * 3600),
+            },
+            'product_name': 'firefox',
+            'unittest_platform': 'android-api-16-opt',
+            'app_name': 'browser',
+            'brand_name': 'Minefield',
+            'base_name': 'Android armv7 API 16+ %(branch)s',
+            'mozconfig': 'in_tree',
+            'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly',
+            'mobile_dir': 'mobile/android',
+            'profiled_build': False,
+            'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
+            'build_space': 16,
+            'upload_symbols': True,
+            'download_symbols': False,
+            'packageTests': True,
+            'create_partial': False,
+            'slaves': SLAVES['mock'],
+            'platform_objdir': OBJDIR,
+            'enable_ccache': True,
+            'enable_shared_checkouts': True,
+            'nightly_signing_servers': 'dep-signing',
+            'dep_signing_servers': 'dep-signing',
+            'use_mock': True,
+            'mock_target': 'mozilla-centos6-x86_64-android',
+            'mock_packages': ['autoconf213', 'mozilla-python27-mercurial',
+                              'ccache', 'zip',
+                              'java-1.7.0-openjdk-devel', 'zlib-devel',
+                              'glibc-static', 'openssh-clients', 'mpfr',
+                              "gcc472_0moz1", "gcc473_0moz1", 'wget', 'glibc.i686',
+                              'libstdc++.i686', 'zlib.i686',
+                              'freetype-2.3.11-6.el6_1.8.x86_64', 'ant', 'ant-apache-regexp'],
+            'mock_copyin_files': [
+                ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
+                ('/home/cltbld/.hgrc', '/builds/.hgrc'),
+                ('/home/cltbld/.boto', '/builds/.boto'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
+                ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
+                ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
+                ('/builds/adjust-sdk.token', '/builds/adjust-sdk.token'),
+                ('/builds/adjust-sdk-beta.token', '/builds/adjust-sdk-beta.token'),
+                ('/builds/relengapi.tok', '/builds/relengapi.tok'),
+                ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
+                ('/tools/tooltool.py', '/builds/tooltool.py'),
+            ],
+            'env': {
+                'DISPLAY': ':2',
+                'HG_SHARE_BASE_DIR': '/builds/hg-shared',
+                'TOOLTOOL_CACHE': '/builds/tooltool_cache',
+                'TOOLTOOL_HOME': '/builds',
+                'MOZ_OBJDIR': OBJDIR,
+                'SHIP_LICENSED_FONTS': '1',
+                'CCACHE_DIR': '/builds/ccache',
+                'CCACHE_COMPRESS': '1',
+                'CCACHE_UMASK': '002',
+                'LC_ALL': 'C',
+                'PATH': '/opt/local/bin:/tools/python/bin:/tools/buildbot/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/',
+            },
+            'enable_opt_unittests': False,
+            'talos_masters': GLOBAL_VARS['talos_masters'],
+            'unittest_masters': GLOBAL_VARS['unittest_masters'],
+            'stage_platform': "android-api-16",
+            'stage_product': 'mobile',
+            'post_upload_include_platform': True,
+            'is_mobile_l10n': True,
+            'l10n_chunks': 5,
+            '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',
+            'tooltool_script': ['/builds/tooltool.py'],
+            'update_platform': 'Android_arm-eabi-gcc3',
+            'updates_enabled': False,
+        },
         'android-x86': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'tools_repo_cache': '/tools/checkouts/build-tools',
             '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',
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -182,17 +182,17 @@ PROJECT_BRANCHES = {
             "devedition": "dev-mozilla-beta_devedition",
         },
         'release_channel_mappings': {
             "firefox": [["^.*$", ["beta-dev"]]],
             "devedition": [["^.*$", ["aurora-dev"]]],
         },
         'uptake_monitoring_platforms': {
             "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
-            "fennec": ("android-api-15", "android-x86"),
+            "fennec": ("android-api-15", "android-api-16", "android-x86"),
             "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),
         },
         # temp balrog
         'balrog_api_root': 'http://ec2-54-159-98-221.compute-1.amazonaws.com:8080/api',
         'funsize_balrog_api_root': 'http://ec2-54-159-98-221.compute-1.amazonaws.com:8080/api',
         'tuxedoServerUrl': 'https://admin-bouncer.stage.mozaws.net/api',
         'bouncer_submitter_config': {
             "firefox": "releases/bouncer_firefox_beta.py",