Merging default -> production production
authorJordan Lund <jlund@mozilla.com>
Mon, 21 Apr 2014 09:45:49 -0700
branchproduction
changeset 10233 7e61f9dabf1d788187bdb75b7ca0f938c262e6d2
parent 10226 62891e2af46840ad8c2589ee7c024d2f6f3007af (current diff)
parent 10232 eb4d64201a5d2faca3da66735fae24e4c4bdaede (diff)
child 10237 fc1ba4a383dceee5a965a7d415a85ef6d82464c0
push id7592
push userjlund@mozilla.com
push dateMon, 21 Apr 2014 16:46:43 +0000
bugs10227, 10223, 10229, 997975, 10230, 991393, 10231, 10232, 984214
Merging default -> production changeset: 10227:ed6a14a43b74 parent: 10223:c8620b84d544 user: ffxbld date: Thu Apr 17 18:14:34 2014 -0700 summary: Update release config for Firefox-29.0b9-build1 changeset: 10229:4e913e8d5c57 parent: 10227:ed6a14a43b74 user: Aki Sasaki <asasaki@mozilla.com> date: Fri Apr 18 10:07:24 2014 -0700 summary: bug 997975 - kill 1.3t linux64 builds. r=callek changeset: 10230:7c968c027abe user: Aki Sasaki <asasaki@mozilla.com> date: Fri Apr 18 11:17:07 2014 -0700 summary: bug 991393 - flame builds on 1.3, 1.4. r=callek changeset: 10231:faadb1d263ae user: Aki Sasaki <asasaki@mozilla.com> date: Fri Apr 18 13:55:01 2014 -0700 summary: bug 991393 - don't build flame on 1.3 until there's a manifest. r=bustage changeset: 10232:eb4d64201a5d tag: tip user: Nick Thomas <nthomas@mozilla.com> date: Fri Apr 18 15:22:36 2014 -0700 summary: bug 984214 - remove js/src/config/milestone.txt bump. r=aki
mozilla/config.py
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1103,16 +1103,29 @@ BRANCHES = {
             'emulator': {},
             'emulator-debug': {},
             'tarako': {},
             'tarako_eng': {},
         },
         'lock_platforms': True,
     },
     'try': {
+        'lock_platforms': True,
+        'platforms': {
+            'linux32_gecko': {},
+            'linux64_gecko': {},
+            'macosx64_gecko': {},
+            'win32_gecko': {},
+            'emulator': {},
+            'emulator-debug': {},
+            'emulator-jb': {},
+            'emulator-jb-debug': {},
+            'emulator-kk': {},
+            'emulator-kk-debug': {},
+        },
     },
 }
 
 # Copy project branches into BRANCHES keys
 for branch in ACTIVE_PROJECT_BRANCHES:
     BRANCHES[branch] = deepcopy(PROJECT_BRANCHES[branch])
 
 # Copy global vars in first, then platform vars
@@ -1237,16 +1250,18 @@ BRANCHES['mozilla-aurora']['platforms'][
 BRANCHES['mozilla-aurora']['platforms']['inari_eng']['enable_periodic'] = False
 BRANCHES['mozilla-aurora']['platforms']['leo']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['hamachi']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['hamachi_eng']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['hamachi_eng']['consider_for_nightly'] = False
 BRANCHES['mozilla-aurora']['platforms']['nexus-4']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['helix']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['wasabi']['enable_nightly'] = True
+BRANCHES['mozilla-aurora']['platforms']['flame']['enable_nightly'] = True
+BRANCHES['mozilla-aurora']['platforms']['flame_eng']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['emulator']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['emulator-debug']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['emulator-jb']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['emulator-jb-debug']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['emulator-kk']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['emulator-kk-debug']['enable_nightly'] = True
 BRANCHES['mozilla-aurora']['platforms']['macosx64_gecko-debug']['enable_nightly'] = False
 BRANCHES['mozilla-aurora']['platforms']['linux64_gecko-debug']['enable_nightly'] = False
@@ -1567,22 +1582,22 @@ for branch in BRANCHES:
 
 # MERGE DAY: wasabi is for B2G 1.3+ only
 for branch in BRANCHES:
     if branch not in ('mozilla-central', 'mozilla-aurora', 'mozilla-inbound',
                       'b2g-inbound', 'mozilla-b2g28_v1_3'):
         if 'wasabi' in BRANCHES[branch]['platforms']:
             del BRANCHES[branch]['platforms']['wasabi']
 
-# MERGE DAY: flame is for B2G 1.5+
+# MERGE DAY: flame is for B2G 1.3+
 for branch in BRANCHES:
-    if branch not in ('mozilla-central', 'mozilla-inbound', 'b2g-inbound'):
+    for name, branch in items_before(BRANCHES, 'gecko_version', 30):
         for p in ('flame', 'flame_eng'):
-            if p in BRANCHES[branch]['platforms']:
-                del BRANCHES[branch]['platforms'][p]
+            if p in branch['platforms']:
+                del branch['platforms'][p]
 
 for branch in BRANCHES:
     if branch not in ('mozilla-central', 'mozilla-aurora'):
         if 'linux64_gecko-debug' in BRANCHES[branch]['platforms']:
             del BRANCHES[branch]['platforms']['linux64_gecko-debug']
 
 # only central and aurora enabled (bug 956451)
 for branch in BRANCHES:
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1659,21 +1659,17 @@ BRANCHES = {
             'win32-debug': {},
             'android-noion': {},
         },
     },
     'mozilla-b2g28_v1_3t': {
         'branch_projects': [],
         'lock_platforms': True,
         'gecko_version': 28,
-        'platforms': {
-            # desktop per bug 986213
-            'linux64': {},
-            'linux64-debug': {},
-        },
+        'platforms': {},
     },
     'mozilla-b2g18': {
         'branch_projects': [],
         'lock_platforms': True,
         'gecko_version': 18,
         'platforms': {
             # desktop for gecko security reproduciton (per akeybl
             # https://bugzil.la/818378#c8)
--- a/mozilla/release-fennec-mozilla-release.py.template
+++ b/mozilla/release-fennec-mozilla-release.py.template
@@ -45,20 +45,16 @@ releaseConfig['sourceRepositories']  = {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
-            'js/src/config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
         }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-release'
 releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mobile-release.json'
 releaseConfig['l10nJsonFile']        = releaseConfig['l10nRevisionFile']
--- a/mozilla/release-firefox-mozilla-release.py.template
+++ b/mozilla/release-firefox-mozilla-release.py.template
@@ -50,20 +50,16 @@ releaseConfig['sourceRepositories']  = {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
-            'js/src/config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
         }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-release'
 releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mozilla-release'
 #  Support repositories
--- a/mozilla/staging_release-fennec-mozilla-release.py.template
+++ b/mozilla/staging_release-fennec-mozilla-release.py.template
@@ -46,20 +46,16 @@ releaseConfig['sourceRepositories']  = {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
-            'js/src/config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
         }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-release'
 releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
 releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mobile-release.json'
--- a/mozilla/staging_release-firefox-mozilla-release.py.template
+++ b/mozilla/staging_release-firefox-mozilla-release.py.template
@@ -54,20 +54,16 @@ releaseConfig['sourceRepositories']  = {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
-            'js/src/config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
         }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-release'
 releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
 releaseConfig['l10nRevisionFile']    = 'l10n-changesets_mozilla-release'