bug 1130090: Set up new builds on larch - enable linux64 graphene builds on larch. r=jlund
authorBen Hearsum <bhearsum@mozilla.com>
Tue, 24 Feb 2015 13:16:43 -0500 (2015-02-24)
changeset 11862 80d1f4462ef127465120917e32cd3602998c45df
parent 11861 cc78da4ee076d179101b4b9b059287325cbd347e
child 11863 8d9202cbf7703103d3cf70411b8e06d351744f24
push id8608
push userbhearsum@mozilla.com
push dateTue, 24 Feb 2015 18:16:52 +0000 (2015-02-24)
reviewersjlund
bugs1130090
bug 1130090: Set up new builds on larch - enable linux64 graphene builds on larch. r=jlund
mozilla/b2g_config.py
mozilla/b2g_project_branches.py
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -52,21 +52,26 @@ GLOBAL_VARS.update({
         'flame_eng': {},
         'flame-kk': {},
         'flame-kk_eng': {},
         'flame-kk_eng-debug': {},
         'dolphin': {},
         'dolphin_eng': {},
         'dolphin-512': {},
         'dolphin-512_eng': {},
+
+        # Graphene builds. These are a different app (ie, not B2G) and would
+        # have their own config files in an ideal world, but it's not worth
+        # the effort at this point.
+        'linux64_graphene': {},
     },
     'enable_nightly': True,
     'enable_l10n': False,
     'enable_xulrunner': False,
-    'enabled_products': ['b2g'],
+    'enabled_products': ['b2g', 'graphene'],
     'product_prefix': 'b2g',
     'unittest_suites': [],
     # XXX: this seems like it should be at the platform level
     'enable_multi_locale': True,
 })
 
 # shorthand, because these are used often
 OBJDIR = GLOBAL_VARS['objdir']
@@ -1551,16 +1556,40 @@ PLATFORM_VARS = {
         },
         'stage_product': 'b2g',
         'product_name': 'b2g',
         'base_name': builder_prefix + '_%(branch)s_%(platform)s',
         'slaves': SLAVES['mock'],
         'enable_periodic': True,
         'enable_dep': False,
     },
+
+
+    "linux64_graphene": {
+        "mozharness_python": "/tools/buildbot/bin/python",
+        "reboot_command": [
+            "/tools/checkouts/mozharness/external_tools/count_and_reboot.py",
+            "-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",
+                "--custom-build-variant-cfg", "graphene"
+            ],
+            "script_timeout": 3 * 3600,
+            "script_maxtime": int(5.5 * 3600),
+        },
+        "stage_product": "graphene",
+        "base_name": "graphene_%(branch)s_linux64",
+        "platform_objdir": OBJDIR,
+        "slaves": SLAVES["mock"],
+    },
 }
 
 for platform in PLATFORM_VARS.values():
     if 'env' not in platform:
         platform['env'] = deepcopy(GLOBAL_ENV)
     else:
         platform['env'].update((k, v) for k, v in GLOBAL_ENV.items() if k not in platform['env'])
 
@@ -1893,16 +1922,22 @@ BRANCHES['try']['platforms']['emulator-k
 BRANCHES['try']['platforms']['emulator-kk']['mozharness_config']['extra_args'] = ['--target', 'emulator-kk', '--config', 'b2g/releng-try.py', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
 BRANCHES['try']['platforms']['emulator-kk']['enable_dep'] = True
 BRANCHES['try']['platforms']['emulator-kk']['enable_periodic'] = False
 BRANCHES['try']['platforms']['emulator-kk-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['emulator-kk-debug']['mozharness_config']['extra_args'] = ['--target', 'emulator-kk', '--config', 'b2g/releng-try.py', '--debug', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
 BRANCHES['try']['platforms']['emulator-kk-debug']['enable_dep'] = True
 BRANCHES['try']['platforms']['emulator-kk-debug']['enable_periodic'] = False
 
+# Graphene is only enabled on Larch for now.
+for name, branch in BRANCHES.iteritems():
+    if name != "larch":
+        if "linux64_graphene" in branch["platforms"]:
+            del branch["platforms"]["linux64_graphene"]
+
 # Mulet landed in gecko 34
 for name, branch in items_before(BRANCHES, 'gecko_version', 34):
     if 'linux64-mulet' in branch['platforms']:
         del branch['platforms']['linux64-mulet']
 
 # Enable win32/macosx64 mulet in gecko 36+
 for name, branch in items_before(BRANCHES, 'gecko_version', 36):
     if 'win32-mulet' in branch['platforms']:
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -109,18 +109,22 @@ PROJECT_BRANCHES = {
         'lock_platforms': True,
         'platforms': {},
     },
     # disabled by bug 1134508
     # 'gum': {},
     # disabled for bug 985718
     #'holly': {},
     'jamun': {},
-    # disabled for bug 1033704
-    #'larch': {},
+    'larch': {
+        "desktop_mozharness_builds_enabled": True,
+        "platforms": {
+            "linux64_graphene": {},
+        },
+    },
     'maple': {},
     # Customizations for integration work for bugs 481815 and 307181
     'oak': {
         'enable_nightly': True
     },
     'pine': {}
 }