Bug 1203186 - tracking bug for B2G 2.5 branching r=hwine
authorRail Aliiev <rail@mozilla.com>
Thu, 29 Oct 2015 16:37:32 -0400 (2015-10-29)
changeset 13229 768a4f68fc251e265bbc41e93d74e6b30851eac4
parent 13227 1be78b122f771f52ae3e7f2717370e6b40dc425d
child 13230 cc778e81c0d4614488bf024a4a6865bb7f117348
child 13233 fc34e111082d70283633d6c1593e4e5d593bff2b
push id9387
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 20:37:38 +0000 (2015-10-29)
reviewershwine
bugs1203186
Bug 1203186 - tracking bug for B2G 2.5 branching r=hwine
mozilla-tests/b2g_config.py
mozilla/b2g_config.py
mozilla/build_localconfig.py
mozilla/config.py
mozilla/production_config.py
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -39,16 +39,20 @@ BRANCHES = {
     'mozilla-b2g37_v2_2': {
         'gecko_version': 37,
         'b2g_version': (2, 2, 0),
     },
     'mozilla-b2g37_v2_2r': {
         'gecko_version': 37,
         'b2g_version': (2, 2, 0),
     },
+    'mozilla-b2g44_v2_5': {
+        'gecko_version': 44,
+        'b2g_version': (2, 5, 0),
+    },
     'mozilla-central': {},
     'mozilla-inbound': {},
     'b2g-inbound': {},
     #'services-central': {},  # Bug 1010674
     'try': {},
 }
 
 setMainFirefoxVersions(BRANCHES)
@@ -954,33 +958,33 @@ PLATFORM_UNITTEST_VARS = {
                     'extra_args': [
                         '--cfg', 'b2g/desktop_automation_config.py',
                         '--test-suite', 'reftest',
                         '--this-chunk', 10, '--total-chunks', 10,
                     ],
                 },
             },
         },
-    },    
+    },
     'macosx64_gecko': {
         'product_name': 'b2g',
         'app_name': 'b2g',
         'brand_name': 'Gecko',
         'builds_before_reboot': 1,
         'unittest-env': {
             "MOZ_NO_REMOTE": '1',
             "NO_EM_RESTART": '1',
             "XPCOM_DEBUG_BREAK": 'warn',
             "MOZ_CRASHREPORTER_NO_REPORT": '1',
             # for extracting dmg's
             "PAGER": '/bin/cat',
         },
         'enable_opt_unittests': False,
         'enable_debug_unittests': False,
-        'enable_talos': False, 
+        'enable_talos': False,
     },
     'emulator': {
         'product_name': 'b2g',
         'app_name': 'b2g',
         'brand_name': 'Gecko',
         'builds_before_reboot': 1,
         'unittest-env': {'DISPLAY': ':0'},
         'enable_opt_unittests': True,
@@ -1605,16 +1609,18 @@ BRANCHES['pine']['platforms']['emulator'
     MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL_CHUNKED
 # disabled for Bug 1150320
 # BRANCHES['jamun']['repo_path'] = "projects/jamun"
 BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
 BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = "releases/mozilla-b2g37_v2_2"
 BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux64_gecko']['enable_opt_unittests'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['repo_path'] = "releases/mozilla-b2g37_v2_2r"
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['linux64_gecko']['enable_opt_unittests'] = True
+BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = "releases/mozilla-b2g44_v2_5"
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['linux64_gecko']['enable_opt_unittests'] = True
 BRANCHES['mozilla-central']['branch_name'] = "Firefox"
 BRANCHES['mozilla-inbound']['repo_path'] = "integration/mozilla-inbound"
 BRANCHES['b2g-inbound']['branch_name'] = "B2g-Inbound"
 BRANCHES['b2g-inbound']['repo_path'] = "integration/b2g-inbound"
 BRANCHES['try']['pgo_strategy'] = "try"
 BRANCHES['try']['enable_try'] = True
 
 # Use chunked Gij in 36+ (bug 1081246)
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -966,16 +966,32 @@ BRANCHES = {
             'emulator': {},
             'emulator-debug': {},
             'emulator-l': {},
             'emulator-l-debug': {},
             'flame-kk': {},
             'flame-kk_eng': {},
         }
     },
+    'mozilla-b2g44_v2_5': {
+        'gecko_version': 44,
+        'b2g_version': (2, 5, 0),
+        'lock_platforms': True,
+        'platforms': {
+            'linux64-b2g-haz': {},
+            'linux64_gecko': {},
+            'linux64_gecko-debug': {},
+            'emulator': {},
+            'emulator-debug': {},
+            'emulator-l': {},
+            'emulator-l-debug': {},
+            'flame-kk': {},
+            'flame-kk_eng': {},
+        }
+    },
     'try': {
         'lock_platforms': True,
         'platforms': {
             'linux64-b2g-haz': {},
             'macosx64-mulet': {},
             'win32-mulet': {},
             'linux64_graphene': {},
             'macosx64_graphene': {},
@@ -1155,16 +1171,35 @@ BRANCHES['mozilla-b2g37_v2_2r']['platfor
     '--config', GLOBAL_VARS['mozharness_configs']['balrog']
 ]
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['flame-kk_eng']['enable_nightly'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-debug']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-l']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['platforms']['emulator-l-debug']['enable_nightly'] = False
 
+######## mozilla-b2g44_v2_5
+# This is a path, relative to HGURL, where the repository is located
+# HGURL + repo_path should be a valid repository
+BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = 'releases/mozilla-b2g44_v2_5'
+# TODO: coordinate l1n repos with bug 1218060
+BRANCHES['mozilla-b2g44_v2_5']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
+BRANCHES['mozilla-b2g44_v2_5']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora'
+BRANCHES['mozilla-b2g44_v2_5']['start_hour'] = [0]
+BRANCHES['mozilla-b2g44_v2_5']['start_minute'] = [45]
+BRANCHES['mozilla-b2g44_v2_5']['periodic_start_minute'] = 30
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['linux64-b2g-haz']['enable_nightly'] = False
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['linux64_gecko']['enable_nightly'] = False
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['flame-kk']['enable_nightly'] = True
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['flame-kk_eng']['enable_nightly'] = True
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator']['enable_nightly'] = False
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator-debug']['enable_nightly'] = False
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator-l']['enable_nightly'] = False
+BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator-l-debug']['enable_nightly'] = False
+
 ######## try
 # Try-specific configs
 # This is a path, relative to HGURL, where the repository is located
 # HGURL  repo_path should be a valid repository
 BRANCHES['try']['repo_path'] = 'try'
 BRANCHES['try']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
 BRANCHES['try']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
 BRANCHES['try']['enable_merging'] = False
--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -29,16 +29,17 @@ else:
     ACTIVE_BRANCHES.extend([
         'mozilla-central',
         'mozilla-beta',
         'mozilla-aurora',
         'mozilla-release',
         'mozilla-esr38',
         'mozilla-b2g37_v2_2',
         'mozilla-b2g37_v2_2r',
+        'mozilla-b2g44_v2_5',
     ])
 if 'limit_tb_branches' in master_config:
     ACTIVE_THUNDERBIRD_BRANCHES = [x.encode("utf-8") for x in master_config['limit_tb_branches']]
 else:
     ACTIVE_THUNDERBIRD_BRANCHES = ACTIVE_THUNDERBIRD_PROJECT_BRANCHES[:]
     ACTIVE_THUNDERBIRD_BRANCHES.extend([
         'comm-central',
         'comm-beta',
@@ -48,16 +49,17 @@ else:
 if 'limit_b2g_branches' in master_config:
     ACTIVE_B2G_BRANCHES = [x.encode("utf-8") for x in master_config['limit_b2g_branches']]
 else:
     ACTIVE_B2G_BRANCHES = ACTIVE_B2G_PROJECT_BRANCHES[:]
     ACTIVE_B2G_BRANCHES.extend([
         'mozilla-central',
         'mozilla-b2g37_v2_2',
         'mozilla-b2g37_v2_2r',
+        'mozilla-b2g44_v2_5',
     ])
     # MERGE DAY: Remove the following block when we are sure b2g CI is moved to
     # taskcluster
     # Add mozilla-aurora on odd-numbered m-c gecko versions
     # b = {'mozilla-central': {}}
     # master_common.setMainFirefoxVersions(b)
     # Starting with v2.2, b2g automation will be handled by taskcluster
     # if b['mozilla-central']['gecko_version'] % 2:
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2173,16 +2173,23 @@ BRANCHES = {
     },
     'mozilla-b2g37_v2_2r': {
         'merge_builds': False,
         'branch_projects': [],
         'lock_platforms': True,
         'gecko_version': 37,
         'platforms': {},
     },
+    'mozilla-b2g44_v2_5': {
+        'merge_builds': False,
+        'branch_projects': [],
+        'lock_platforms': True,
+        'gecko_version': 44,
+        'platforms': {},
+    },
     'try': {
         'branch_projects': ['spidermonkey_try'],
         # The following platforms are not part of the default set,
         # so only run on Try.
         'extra_platforms': {
             'linux64-sh-haz': {},
             'linux64-cc': {},
             'linux64-tsan': {},
@@ -2558,16 +2565,44 @@ BRANCHES['mozilla-b2g37_v2_2r']['enUS_bi
 BRANCHES['mozilla-b2g37_v2_2r']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['create_partial'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['enable_blocklist_update'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['enable_hsts_update'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['enable_hpkp_update'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['enable_valgrind'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['enabled_products'] = ['firefox']
 
+######## mozilla-b2g44_v2_5
+BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = 'releases/mozilla-b2g44_v2_5'
+BRANCHES['mozilla-b2g44_v2_5']['update_channel'] = 'nightly-b2g44-2.5'
+BRANCHES['mozilla-b2g44_v2_5']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
+BRANCHES['mozilla-b2g44_v2_5']['enable_weekly_bundle'] = False
+BRANCHES['mozilla-b2g44_v2_5']['enable_perproduct_builds'] = True
+BRANCHES['mozilla-b2g44_v2_5']['start_hour'] = [3]
+BRANCHES['mozilla-b2g44_v2_5']['start_minute'] = [45]
+BRANCHES['mozilla-b2g44_v2_5']['pgo_platforms'] = []
+BRANCHES['mozilla-b2g44_v2_5']['enable_mac_a11y'] = True
+BRANCHES['mozilla-b2g44_v2_5']['unittest_build_space'] = 6
+# L10n configuration
+BRANCHES['mozilla-b2g44_v2_5']['enable_l10n'] = False
+BRANCHES['mozilla-b2g44_v2_5']['enable_l10n_onchange'] = False
+BRANCHES['mozilla-b2g44_v2_5']['l10nNightlyUpdate'] = False
+BRANCHES['mozilla-b2g44_v2_5']['l10n_platforms'] = ['linux', 'linux64',
+                                                    'win32', 'macosx64']
+BRANCHES['mozilla-b2g44_v2_5']['l10nDatedDirs'] = True
+BRANCHES['mozilla-b2g44_v2_5']['enUS_binaryURL'] = \
+    GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g44_v2_5'
+BRANCHES['mozilla-b2g44_v2_5']['enable_nightly'] = False
+BRANCHES['mozilla-b2g44_v2_5']['create_partial'] = False
+BRANCHES['mozilla-b2g44_v2_5']['enable_blocklist_update'] = False
+BRANCHES['mozilla-b2g44_v2_5']['enable_hsts_update'] = True
+BRANCHES['mozilla-b2g44_v2_5']['enable_hpkp_update'] = True
+BRANCHES['mozilla-b2g44_v2_5']['enable_valgrind'] = False
+BRANCHES['mozilla-b2g44_v2_5']['enabled_products'] = ['firefox']
+
 
 ######## try
 # Try-specific configs
 BRANCHES['try']['stage_username'] = 'trybld'
 BRANCHES['try']['stage_username_mobile'] = 'trybld'
 BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
 BRANCHES['try']['stage_ssh_mobile_key'] = 'trybld_dsa'
 BRANCHES['try']['stage_base_path'] = '/home/ftp/pub/firefox/try-builds'
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -105,16 +105,21 @@ BRANCHES = {
         'tinderbox_tree': 'Mozilla-B2g37-v2.2',
         'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2',
     },
     'mozilla-b2g37_v2_2r': {
         'packaged_unittest_tinderbox_tree': 'Mozilla-B2g37-v2.2r',
         'tinderbox_tree': 'Mozilla-B2g37-v2.2r',
         'mobile_tinderbox_tree': 'Mozilla-B2g37-v2.2r',
     },
+    'mozilla-b2g44_v2_5': {
+        'packaged_unittest_tinderbox_tree': 'Mozilla-B2g44-v2.5',
+        'tinderbox_tree': 'Mozilla-B2g44-v2.5',
+        'mobile_tinderbox_tree': 'Mozilla-B2g44-v2.5',
+    },
     'mozilla-beta': {
         'packaged_unittest_tinderbox_tree': 'Mozilla-Beta',
         'tinderbox_tree': 'Mozilla-Beta',
         'mobile_tinderbox_tree': 'Mozilla-Beta',
     },
     'mozilla-aurora': {
         'packaged_unittest_tinderbox_tree': 'Mozilla-Aurora',
         'tinderbox_tree': 'Mozilla-Aurora',