Bug 1100150, setup Alder for taskcluster work, r=jlund
authorNick Thomas <nthomas@mozilla.com>
Mon, 24 Nov 2014 11:58:04 +1300 (2014-11-23)
changeset 11446 db3d26a7df09844e0b3370bd104903b9dbf4a76b
parent 11444 fe8af8265fc81696ac3bbb9afe40aef3e8263ecc
child 11447 c576f5dd6669e7d44aff1e7c51ef928c0f3dd579
child 11448 85e8292d65a427ac14fd3ac4552302985e9f3950
push id8355
push usernthomas@mozilla.com
push dateSun, 23 Nov 2014 22:58:17 +0000 (2014-11-23)
reviewersjlund
bugs1100150
Bug 1100150, setup Alder for taskcluster work, r=jlund
mozilla-tests/b2g_config.py
mozilla/b2g_project_branches.py
mozilla/l10n/all-locales.alder
mozilla/master_common.py
mozilla/project_branches.py
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -26,16 +26,24 @@ except ImportError:
         return s
 
 GLOBAL_VARS = deepcopy(GLOBAL_VARS)
 
 GLOBAL_VARS['stage_username'] = 'ffxbld'
 GLOBAL_VARS.update(b2g_localconfig.GLOBAL_VARS.copy())
 
 BRANCHES = {
+    'alder': {
+        'lock_platforms': True,
+        'platforms': {
+            'linux32_gecko': {},
+            'linux64_gecko': {},
+            'linux64-mulet': {},
+        },
+    },
     'ash': {},
     # Not needed right now, see bug 977420
     # 'birch': {},
     'cedar': {},
     'cypress': {},
     'jamun': {},
     'pine': {},
     'fx-team': {},
@@ -2171,16 +2179,18 @@ for branch in BRANCHES.keys():
     BRANCHES[branch]['enable_unittests'] = True
     BRANCHES[branch]['fetch_symbols'] = True
     BRANCHES[branch]['fetch_release_symbols'] = False
     BRANCHES[branch]['pgo_strategy'] = None
     BRANCHES[branch]['pgo_platforms'] = []
 
 # The following are exceptions to the defaults
 
+BRANCHES['alder']['branch_name'] = "Alder"
+BRANCHES['alder']['repo_path'] = "projects/alder"
 BRANCHES['ash']['branch_name'] = "Ash"
 BRANCHES['ash']['repo_path'] = "projects/ash"
 BRANCHES['ash']['mozharness_repo'] = "https://hg.mozilla.org/build/ash-mozharness"
 BRANCHES['ash']['mozharness_tag'] = "default"
 BRANCHES['cedar']['branch_name'] = "Cedar"
 BRANCHES['cedar']['repo_path'] = "projects/cedar"
 BRANCHES['cedar']['mozharness_tag'] = "default"
 BRANCHES['cedar']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] = \
--- a/mozilla/b2g_project_branches.py
+++ b/mozilla/b2g_project_branches.py
@@ -31,18 +31,25 @@ PROJECT_BRANCHES = {
     # B2G builds not required on the UX branch
     #'ux': {
     #    'branch_name': 'UX',
     #    'mobile_branch_name': 'UX',
     #    'build_branch': 'UX',
     #    'enable_nightly': True,
     #},
     #####  TWIGS aka RENTABLE BRANCHES
-    # Booked for Thunderbird
-    #'alder': {},
+    'alder': {
+        'lock_platforms': True,
+        'platforms': {
+            'linux32_gecko': {},
+            'linux64_gecko': {},
+            'linux64_gecko-debug': {},
+            'linux64-mulet': {},
+        },
+    },
     'ash': {
         'mozharness_repo_path': 'build/ash-mozharness',
         'mozharness_repo': 'https://hg.mozilla.org/build/ash-mozharness',
         'mozharness_tag': 'default',
         'use_mozharness_repo_cache': False,
     },
     # Not needed on Birch at the moment, bug 977420.
     #'birch': {},
deleted file mode 100644
--- a/mozilla/l10n/all-locales.alder
+++ /dev/null
@@ -1,30 +0,0 @@
-ach
-af
-ast
-da
-de
-en-GB
-es-AR
-es-CL
-es-ES
-es-MX
-fi
-fr
-fy-NL
-he
-hu
-it
-ja
-ja-JP-mac
-ko
-lv
-nb-NO
-nn-NO
-pa-IN
-pl
-pt-BR
-rm
-ru
-sk
-sl
-zh-TW
--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -20,33 +20,31 @@ c['schedulers'] = []
 c['change_source'] = []
 
 # Builders from these branches are given custom priority, default is 4 for unlisted branches
 # Please leave in sorted order
 DEFAULT_BRANCH_PRIORITY = 4
 BRANCH_PRIORITIES = {
     'mozilla-release': 0,
     'comm-esr31': 0,
-    #  Alder is moved here to support 33.1 - remove and uncomment below once it ships
-    'alder': 1,
     'mozilla-esr31': 1,
     'mozilla-beta': 2,
     'comm-beta': 2,
     'mozilla-central': 3,
     'comm-central': 3,
     'mozilla-aurora': 3,
     'comm-aurora': 3,
     # Unlisted branches are prioritized at this level
     'mozilla-inbound': 4,
     'b2g-inbound': 4,
     'fx-team': 4,
     'gaia-try': 4,
     'try': 5,
     'try-comm-central': 5,
-    # 'alder': 5,
+    'alder': 5,
     'ash': 5,
     'birch': 5,
     'cedar': 5,
     'cypress': 5,
     'date': 5,
     'elm': 5,
     'fig': 5,
     'gum': 5,
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -82,69 +82,18 @@ PROJECT_BRANCHES = {
             'win32': {
                 'nightly_signing_servers': 'nightly-signing',
             },
             'win64': {
                 'nightly_signing_servers': 'nightly-signing',
             },
         },
     },
-    'alder': {
-        # Per bug 1083853, this disable mozharness mach and other
-        # mozilla-central oriented features
-        'gecko_version': 33,
-        # Make every checkin trigger builds, remove after 33.1 (or sooner)
-        'enable_perproduct_builds': False,
-        'enable_nightly': True,
-        'create_snippet': True,
-        'create_partial': True,
-        'nightly_signing_servers': 'nightly-signing',
-        'l10n_repo_path': 'releases/l10n/mozilla-release',
-        'pgo_strategy': 'per-checkin',
-        'enable_mac_a11y': True,
-        'enable_l10n': True,
-        'enable_l10n_onchange': True,
-        'enUS_binaryURL': '/nightly/latest-alder',
-        'l10nNightlyUpdate': True,
-        'l10nDatedDirs': True,
-        'l10n_tree': 'fxrel',
-        'l10n_platforms': ['linux', 'linux64', 'win32', 'macosx64'],
-        # explicitly set the server to avoid using variables
-        'localesURL': 'http://hg.mozilla.org/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.alder',
-        'enable_multi_locale': True,
-        'upload_mobile_symbols': True,
-        'enable_valgrind': False,
-        'enabled_products': ['firefox'],
-        'lock_platforms': True,
-        'platforms': {
-            'macosx64': {
-                'test_pretty_names': True,
-            },
-            'linux': {
-                'test_pretty_names': True,
-            },
-            'linux64': {
-                'test_pretty_names': True,
-            },
-            'win32': {
-                'test_pretty_names': True,
-            },
-            'win64': {},
-            'linux-debug': {},
-            'linux64-br-haz': {},
-            'linux64-debug': {},
-            'linux64-asan': {},
-            'linux64-asan-debug': {},
-            'linux64-st-an-debug': {},
-            'linux64-cc': {},
-            'macosx64-debug': {},
-            'win32-debug': {},
-            'win64-debug': {},
-        },
-    },
+    # no desktop builds for bug 1100150
+    # 'alder': {},
     'ash': {
         'enable_perproduct_builds': False,
         'desktop_mozharness_repacks_enabled': True,
         'enable_nightly': True,
         'mozharness_repo_path': 'build/ash-mozharness',
         'mozharness_repo': 'https://hg.mozilla.org/build/ash-mozharness',
         'mozharness_tag': 'default',
         'use_mozharness_repo_cache': False,